simple_model 0.2.6 → 1.0.0

data/Gemfile.lock

@@ -2,32 +2,38 @@ PATH
   remote: .
   specs:
     simple_model (0.2.6)
-      activemodel (~> 3.0.5)
-      activesupport (~> 3.0.5)
+      activemodel (~> 3.0)
+      activesupport (~> 3.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.10)
-      activesupport (= 3.0.10)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activesupport (3.0.10)
-    builder (2.1.2)
+    ZenTest (4.6.2)
+    activemodel (3.1.1)
+      activesupport (= 3.1.1)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activesupport (3.1.1)
+      multi_json (~> 1.0)
+    autotest (4.4.6)
+      ZenTest (>= 4.4.1)
+    builder (3.0.0)
     diff-lcs (1.1.3)
-    i18n (0.5.0)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
+    i18n (0.6.0)
+    multi_json (1.0.3)
+    rspec (2.7.0)
+      rspec-core (~> 2.7.0)
+      rspec-expectations (~> 2.7.0)
+      rspec-mocks (~> 2.7.0)
+    rspec-core (2.7.1)
+    rspec-expectations (2.7.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
+    rspec-mocks (2.7.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  autotest
   rspec
   simple_model!

data/README.md

@@ -16,15 +16,42 @@ SimpleModel is available through [Rubygems](http://rubygems.org/gems/simple_mode
       require 'simple_model'
 
         class Item < SimpleModel::Base
+          save :save_item, :rollback => :undo_save
           has_booleans :active, :default => true
           has_booleans :paid
           has_currency :price, :default => 10.0
-          has_dates :created_at
+          has_times :created_at, :default => :now
           validates_inclusion_of :price, :in => 10..25
+          
+          def now
+            Time.now
+          end
+
+          def file_name
+           @file_name ||= "receipt-#{self.created_at.to_i}.txt"
+          end
+          
+          def save_item
+            begin
+              File.open(self.file_name, 'w') do |receipt|
+                receipt.puts self.created_at
+                receipt.puts "price:#{self.price}"
+                receipt.puts "paid:#{self.paid}"
+              end
+            rescue
+              return false
+            end
+            true
+          end
+
+          def undo_save
+            File.delete(file_name)
+          end
         end
         
-        item = Item.new(:created_at => "12/30/2010")
-        item.created_at # => #<Date: 2010-12-30 (4911121/2,0,2299161)>
+        item = Item.new
+        item.created_at # => 2011-10-23 21:56:07 -0500
+        item.created_at # => 2011-10-23 21:56:08 -0500
         item.active     # => true
         item.paid       # => nil
         item.paid?      # => false
@@ -32,6 +59,9 @@ SimpleModel is available through [Rubygems](http://rubygems.org/gems/simple_mode
         item.price = '$1,024.00'
         item.price      # => #<BigDecimal:100c989d8,'0.1024E4',9(27)>
         item.valid?     # => false
+        item.price = 15 
+        item.save       # => true
+                        
 
 
 ## Contributing to simple_model

data/lib/simple_model/attributes.rb

@@ -6,29 +6,11 @@ module SimpleModel
   module Attributes
     include ExtendCore
 
-    attr_accessor :id, :saved
     #Set attribute values to those supplied at initialization
     def initialize(*attrs)
       set_attributes(attrs.extract_options!)
     end
 
-    def new_record
-      @new_record = true if @new_record.nil?
-      @new_record
-    end
-
-    def new_record?
-      new_record
-    end
-
-    def new_record=(new_record)
-      @new_record = new_record
-    end
-
-    def persisted?
-      saved.to_b
-    end
-
     # Place to store set attributes and their values
     def attributes
       @attributes ||= {}
@@ -40,10 +22,8 @@ module SimpleModel
         self.send("#{attr[0].to_sym}=",attr[1])
       end
     end
-
     alias :update_attributes :set_attributes
 
-
     def self.included(base)
       base.extend(ClassMethods)
     end
@@ -77,7 +57,6 @@ module SimpleModel
             instance_variable_set("@#{attr}", val.to_s.to_b)
             attributes[attr] = val
             val
-
           end
 
           define_method ("#{attr.to_s}?") do
@@ -106,7 +85,7 @@ module SimpleModel
 
       # Creates setter and getter methods for currency attributes
       # attributes are cast to BigDecimal and rounded to nearest cent
-      # Warning, rounding occurs on all sets, so if you need to keep higher prescsion
+      # #Warning, rounding occurs on all sets, so if you need to keep higher prescsion
       # use has_decimals
       def has_currency(*attrs)
         options = attrs.extract_options!
@@ -184,7 +163,6 @@ module SimpleModel
         end
       end
 
-
       def fetch_alias_name(attr)
         alias_name = (attr.to_s << "_old=").to_sym
         self.module_eval("alias #{alias_name} #{attr}")
@@ -197,8 +175,9 @@ module SimpleModel
       def define_reader_with_options(attr,options)
         unless options[:default].blank?
           define_method (attr.to_s) do
-            val = instance_variable_get("@#{attr.to_s}")
-            val = options[:default] if val.nil?
+            default = options[:default].is_a?(Symbol) ? self.send(options[:default]) : options[:default]
+            val = instance_variable_get("@#{attr.to_s}")    
+            val = default if val.nil?
             val
           end
         end

data/lib/simple_model/base.rb

@@ -1,5 +1,5 @@
-module SimpleModel
-  # require all that active support we know and love
+module SimpleModel  
+  # Require all that active support we know and love
   require 'active_support/time'
   require 'active_support/core_ext/class/attribute'
   require 'active_support/core_ext/class/attribute_accessors'
@@ -16,13 +16,127 @@ module SimpleModel
   require 'active_support/core_ext/object/duplicable'
   require 'active_support/core_ext/object/blank'
 
+  # == SimpleModel::Base
+  #
+  # Provides an interface for any class to build tabless models.
+  # 
+  # Implements Validations and Callsbacks from ActiveModel and attribute datatype specific
+  # attribute definition with default options
+  # 
+  # == SimpleModel Actions:
+  # 
+  # Model actions provide a tool for making use of Active Model callbacks. Each
+  # action creates an instance method representing the action, which calls the 
+  # method(s) listed as symbolswhen defining the actions. Model actions also accept 
+  # a rollback option, which is called if the action fails. If you plan to 
+  # implement SimpleModel's actions make avoid naming you own methods "save", "destory",
+  # "create", and "update", as this will override the methods defined by action.
+  # 
+  # Available Actions:
+  #   # save
+  #   # update
+  #   # create
+  #   # destory
+  # 
+  # ==== Example
+  # 
+  # class MyModel < SimpleModel::Base
+  #   save :my_save, :rollback => :undo_save
+  #   update :my_update, :rollback => :undo_update
+  #   destroy :my_destory, :rollback => :undo_destory
+  # end
+  # 
+  # A basic SimpleModel implementation might resemble
+  # 
+  # class MyModel < SimpleModel::Base
+  # 
+  #   has_integers :first_int, :second_int, :default => 1
+  #   has_times :now, :default => :get_now
+  #   
+  #   save :save_record, :rollback => :rollback
+  # 
+  #   def save_record
+  #     puts "saved"
+  #     true
+  #   end
+  # 
+  #   def get_today
+  #     Time.now
+  #   end
+  #   
+  #   def rollback
+  #     puts "rolled back"
+  #   end
+  # end
+  # 
+  # 
+  #
+ 
   class Base
     include SimpleModel::Attributes
     include SimpleModel::ErrorHelpers
 
-    #User ActiveModel Resources
+    #Use ActiveModel Resources
     include ActiveModel::Validations
     include ActiveModel::Conversion
     extend ActiveModel::Naming
+    extend ActiveModel::Callbacks
+    include ActiveModel::Validations::Callbacks
+    define_model_callbacks :save, :update, :create, :destroy
+     
+    has_boolean :saved
+    has_boolean :new_record, :default => true
+    
+    attr_accessor :id
+
+    def persisted?
+      saved?
+    end
+     
+    
+    def self.save(*methods)
+      define_model_action(methods,:save)
+    end
+    
+    def self.create(*methods)
+      define_model_action(methods,:create)
+    end
+    
+    def self.update(*methods)
+      define_model_action(methods,:update)
+    end
+    
+    def self.destroy(*methods)
+      define_model_action(methods,:destroy)
+    end 
+    
+    private
+    
+    def run_model_action(methods,options)
+      completed = true
+      if self.valid?
+        methods.each do |method|
+          ran = self.send(method)
+          completed = ran unless ran
+        end
+        if completed
+          self.saved = true
+        else
+          self.send(options[:rollback]) unless options[:rollback].blank?
+        end    
+      else 
+        completed = false
+      end  
+      completed
+    end
+    
+    def self.define_model_action(methods,action)
+      options = methods.extract_options!
+      define_method(action) do
+        self.run_callbacks(action) do  
+          run_model_action(methods,options)
+        end
+      end
+    end
   end
 end

data/lib/simple_model/extend_core.rb

@@ -145,8 +145,14 @@ module SimpleModel
           :middle_name => (parts * " " unless parts.empty?) }
       end
     end
+    
+   BigDecimal.class_eval do
+    def to_currency_s(symbol="$")
+      self.to_f.to_currency_s(symbol)
+    end 
+   end
+    
     Fixnum.class_eval do
-
       #Any value greater than 0 is true
       def to_b
         self > 0

data/lib/simple_model/version.rb

@@ -1,3 +1,3 @@
 module SimpleModel
-  VERSION = "0.2.6"
+  VERSION = "1.0.0"
 end

data/lib/simple_model.rb

@@ -1,3 +1,25 @@
+#--
+# Copyright (c) 2010-2011 Joshua Thomas Mckinney
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
 module SimpleModel
 
   #Get those rails goodies

data/simple_model.gemspec

@@ -2,7 +2,6 @@
 $:.push File.expand_path("../lib", __FILE__)
 require "simple_model/version"
 
-
 Gem::Specification.new do |s|
   s.name        = "simple_model"
   s.version     = SimpleModel::VERSION
@@ -13,10 +12,11 @@ Gem::Specification.new do |s|
   s.summary     = %q{Simpifies building tableless models or models backed by webservices}
   s.description = %q{Simpifies building tableless models or models backed by webservices. Create data type specific attributes with default if values.}
 
-  s.add_runtime_dependency 'activesupport','~> 3.0.5'
-  s.add_runtime_dependency 'activemodel',"~> 3.0.5"
+  s.add_runtime_dependency 'activesupport','~> 3.0'
+  s.add_runtime_dependency 'activemodel','~> 3.0'
 
   s.add_development_dependency 'rspec'
+  s.add_development_dependency 'autotest'
 
   s.rubyforge_project = "simple_model"
 

data/spec/attributes_spec.rb

@@ -24,7 +24,7 @@ describe SimpleModel::Attributes do
 
 end
 describe SimpleModel::Attributes, 'define_reader_with_options' do
-  before(:all) do
+  before(:each) do
     class TestDefault
       include SimpleModel::Attributes
       attr_accessor :test
@@ -41,6 +41,23 @@ describe SimpleModel::Attributes, 'define_reader_with_options' do
     default.test = "New"
     default.test.should eql("New")
   end
+  
+  context 'default value is a symbol' do
+    it "should call the method it describes" do
+      class TestDefault
+        include SimpleModel::Attributes
+        attr_accessor :test
+        define_reader_with_options :test, :default => :default_value
+        def default_value
+          "test"
+        end
+      end
+      
+      default = TestDefault.new
+      default.test.should eql("test")
+    end
+  end
+  
 
 end
 describe SimpleModel::Attributes, 'has_booleans' do

data/spec/simple_model_spec.rb

@@ -1,6 +1,28 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe SimpleModel do
+  
+  describe "save" do
+    
+    it "should perform the supplied methods" do
+      class TestStuff < SimpleModel::Base
+        save :test
+        
+        attr_accessor :foo
+        
+        def test
+          self.foo = "test"
+          return true
+        end
+      end
+      
+      t = TestStuff.new
+      t.save
+      t.foo.should eql("test")
+    end
+  end
+  
+  
   it 'Should add a boolean setter' do
     class TestStuff < SimpleModel::Base
       has_booleans :test_boolean
@@ -12,10 +34,10 @@ describe SimpleModel do
     class TestStuff < SimpleModel::Base
       has_booleans :test_boolean
     end
-   t =  TestStuff.new
-   t.methods.include?(:test_boolean).should be_true
-   t.test_boolean = true
-   t.test_boolean.should be_true
+    t =  TestStuff.new
+    t.methods.include?(:test_boolean).should be_true
+    t.test_boolean = true
+    t.test_boolean.should be_true
     #a.test.should be_false
   end
   it 'Should add a error setter' do
@@ -28,6 +50,71 @@ describe SimpleModel do
     a.errors.add(:test_attr, "test")
     a.errors?.should be_true
   end
+  
+  it 'Should include validation callbacks' do
+    class TestStuff < SimpleModel::Base
+    end
+    TestStuff.respond_to?(:before_validation).should be_true
+    TestStuff.respond_to?(:after_save).should be_true
+    
+  end
+  
+  it 'Should include peform validation callbacks' do
+    class TestStuff < SimpleModel::Base
+      before_validation :set_foo   
+      after_validation :set_bar
+      attr_accessor :foo,:bar
+      validates :foo, :presence => true
+     
+         
+      private
+      def set_foo
+        self.foo = "foo"
+      end
+      
+      def set_bar
+        self.bar = "bar"
+      end
+    end
+    
+    t = TestStuff.new
+    t.valid?
+    t.foo.should eql('foo') 
+    t.bar.should eql('bar')
+  end
+  
+  it "should run call backs on save" do
+    class TestStuff < SimpleModel::Base
+      save do
+        puts "saved"
+        true
+      end
+      before_save :set_foo   
+      after_validation :set_bar
+      attr_accessor :foo,:bar
+      validates :foo, :presence => true
+     
+      
+      private
+      
+      def my_save_method
+        true
+      end
+      
+      def set_foo
+        self.foo = "foo"
+      end
+      
+      def set_bar
+        self.bar = "bar"
+      end
+    end
+    
+    t = TestStuff.new
+    t.save
+    t.foo.should eql('foo') 
+    t.bar.should eql('bar')
+  end
 end
 
 #describe SimpleModel::Errors do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_model
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,33 +9,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-15 00:00:00.000000000Z
+date: 2011-10-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70363326271940 !ruby/object:Gem::Requirement
+  requirement: &70349578811140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.5
+        version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70363326271940
+  version_requirements: *70349578811140
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70363326271380 !ruby/object:Gem::Requirement
+  requirement: &70349578810640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.5
+        version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70363326271380
+  version_requirements: *70349578810640
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70363326270960 !ruby/object:Gem::Requirement
+  requirement: &70349578810260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70363326270960
+  version_requirements: *70349578810260
+- !ruby/object:Gem::Dependency
+  name: autotest
+  requirement: &70349578809800 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70349578809800
 description: Simpifies building tableless models or models backed by webservices.
   Create data type specific attributes with default if values.
 email: