riveter 0.3.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac7829381fcfecbda57c395c23653edc8df876b3
-  data.tar.gz: 57005498bcf3833e4b487f8d1e174cfd6adb5b77
+  metadata.gz: 0af369c290c92292bc05e43a0cbef0e2c351b472
+  data.tar.gz: 4f24145bf053b9dc42dff0b244a4fd98f082adbb
 SHA512:
-  metadata.gz: 3cda2c9c10fa00fef707ed7d8bff72b40684ed8f3f088fb8fecb6879988d30a4ce02d0b57056da324bb8c1a77ac5a3fe9ba822bfa9082ad75ee767d00bbade38
-  data.tar.gz: e0853c278c745da742bf13bd9e6d6b2a1319f0297b09b0a9864eccf77b7b397eaa979025f7848ddd683fbaf335f2ab4bbef621c63003747385a72f21722ddcd7
+  metadata.gz: 9f42fa9443a5faf0ca77e413b4e60ec6d1e1f912d8c20cf77d42691656da06575e36d7f70fa53cd22b9557b6d216f800f22ebea13662af4dafb0e92211ade58a
+  data.tar.gz: 1e2746430be6705fbe977132e98266bd1378bc9785bb70fa1ccbaadeaaee41cbed2f749ada5a7e7765cb6f9446d6d85532404845522d9a6f426f97a6dad2526c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    riveter (0.3.0)
+    riveter (0.6.0)
       activemodel (>= 4.0.0)
       railties (>= 4.0.0)
       validates_timeliness (>= 3.0.0)
@@ -9,65 +9,64 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.1)
-      actionpack (= 4.2.1)
-      actionview (= 4.2.1)
-      activejob (= 4.2.1)
+    actionmailer (4.2.7.1)
+      actionpack (= 4.2.7.1)
+      actionview (= 4.2.7.1)
+      activejob (= 4.2.7.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.1)
-      actionview (= 4.2.1)
-      activesupport (= 4.2.1)
+    actionpack (4.2.7.1)
+      actionview (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    actionview (4.2.1)
-      activesupport (= 4.2.1)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.7.1)
+      activesupport (= 4.2.7.1)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    activejob (4.2.1)
-      activesupport (= 4.2.1)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (4.2.7.1)
+      activesupport (= 4.2.7.1)
       globalid (>= 0.3.0)
-    activemodel (4.2.1)
-      activesupport (= 4.2.1)
+    activemodel (4.2.7.1)
+      activesupport (= 4.2.7.1)
       builder (~> 3.1)
-    activerecord (4.2.1)
-      activemodel (= 4.2.1)
-      activesupport (= 4.2.1)
+    activerecord (4.2.7.1)
+      activemodel (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
       arel (~> 6.0)
-    activesupport (4.2.1)
+    activesupport (4.2.7.1)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    ammeter (1.1.2)
+    ammeter (1.1.3)
       activesupport (>= 3.0)
       railties (>= 3.0)
       rspec-rails (>= 2.2)
-    arel (6.0.0)
+    arel (6.0.3)
     builder (3.2.2)
     byebug (4.0.5)
       columnize (= 0.9.0)
-    coderay (1.1.0)
+    coderay (1.1.1)
     columnize (0.9.0)
-    coveralls (0.8.1)
-      json (~> 1.8)
-      rest-client (>= 1.6.8, < 2)
-      simplecov (~> 0.10.0)
+    concurrent-ruby (1.0.2)
+    coveralls (0.8.15)
+      json (>= 1.8, < 3)
+      simplecov (~> 0.12.0)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
+      tins (>= 1.6.0, < 2)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    domain_name (0.5.24)
-      unf (>= 0.0.5, < 1.0.0)
     erubis (2.7.0)
-    globalid (0.3.5)
+    globalid (0.3.7)
       activesupport (>= 4.1.0)
-    haml (4.0.6)
+    haml (4.0.7)
       tilt
     haml-rails (0.9.0)
       actionpack (>= 4.0.1)
@@ -80,60 +79,57 @@ GEM
       haml (~> 4.0.0)
       nokogiri (~> 1.6.0)
       ruby_parser (~> 3.5)
-    http-cookie (1.0.2)
-      domain_name (~> 0.5)
     i18n (0.7.0)
-    json (1.8.2)
-    loofah (2.0.2)
+    json (1.8.3)
+    loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
     method_source (0.8.2)
-    mime-types (2.6.1)
-    mini_portile (0.6.2)
-    minitest (5.7.0)
-    netrc (0.10.3)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
-    pry (0.10.1)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.1.0)
+    minitest (5.9.0)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
+    pkg-config (1.1.7)
+    pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
     pry-byebug (3.1.0)
       byebug (~> 4.0)
       pry (~> 0.10)
-    rack (1.6.1)
+    rack (1.6.4)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.1)
-      actionmailer (= 4.2.1)
-      actionpack (= 4.2.1)
-      actionview (= 4.2.1)
-      activejob (= 4.2.1)
-      activemodel (= 4.2.1)
-      activerecord (= 4.2.1)
-      activesupport (= 4.2.1)
+    rails (4.2.7.1)
+      actionmailer (= 4.2.7.1)
+      actionpack (= 4.2.7.1)
+      actionview (= 4.2.7.1)
+      activejob (= 4.2.7.1)
+      activemodel (= 4.2.7.1)
+      activerecord (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.1)
+      railties (= 4.2.7.1)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.6)
+    rails-dom-testing (1.0.7)
       activesupport (>= 4.2.0.beta, < 5.0)
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.2)
+    rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (4.2.1)
-      actionpack (= 4.2.1)
-      activesupport (= 4.2.1)
+    railties (4.2.7.1)
+      actionpack (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
-    rest-client (1.8.0)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
     rspec-core (3.2.3)
       rspec-support (~> 3.2.0)
     rspec-expectations (3.2.1)
@@ -142,7 +138,7 @@ GEM
     rspec-mocks (3.2.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.2.0)
-    rspec-rails (3.2.1)
+    rspec-rails (3.2.3)
       actionpack (>= 3.0, < 4.3)
       activesupport (>= 3.0, < 4.3)
       railties (>= 3.0, < 4.3)
@@ -151,35 +147,33 @@ GEM
       rspec-mocks (~> 3.2.0)
       rspec-support (~> 3.2.0)
     rspec-support (3.2.2)
-    ruby_parser (3.7.0)
+    ruby_parser (3.8.2)
       sexp_processor (~> 4.1)
-    sexp_processor (4.6.0)
+    sexp_processor (4.7.0)
     shoulda-matchers (2.8.0)
       activesupport (>= 3.0.0)
-    simplecov (0.10.0)
+    simplecov (0.12.0)
       docile (~> 1.1.0)
-      json (~> 1.8)
+      json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     slop (3.6.0)
-    sprockets (3.1.0)
-      rack (~> 1.0)
-    sprockets-rails (2.3.1)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
-    term-ansicolor (1.3.0)
+    sprockets (3.7.0)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.0)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    term-ansicolor (1.3.2)
       tins (~> 1.0)
     thor (0.19.1)
     thread_safe (0.3.5)
-    tilt (2.0.1)
+    tilt (2.0.5)
     timeliness (0.3.8)
-    tins (1.5.2)
+    tins (1.12.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.1)
     validates_timeliness (4.0.2)
       timeliness (~> 0.3.7)
 

data/lib/riveter/attributes.rb

@@ -26,9 +26,13 @@ module Riveter
 
     module ClassMethods
       def attr_string(name, options={}, &block)
+        options = {
+          :validate => true
+        }.merge(options)
+
         converter = block_given? ? block : Converters.converter_for(:string)
 
-        attr_reader_with_converter name, converter
+        attr_reader_with_converter name, converter, options
         attr_writer name
 
         add_attr(name, :string, converter, options)
@@ -65,8 +69,15 @@ module Riveter
           limit_value = options.delete(limit)
 
           define_method :"#{name}_#{limit}" do
-            limit_value.respond_to?(:call) ? limit_value.call : limit_value
+            instance_variable_get("@#{name}_#{limit}") ||
+              (limit_value.respond_to?(:call) ? instance_exec(&limit_value) : limit_value)
+          end
+
+          # can manually assign the min/max
+          define_method :"#{name}_#{limit}=" do |value|
+            instance_variable_set("@#{name}_#{limit}", value)
           end
+
         end
 
         converter = block_given? ? block : Converters.converter_for(:date)
@@ -105,7 +116,7 @@ module Riveter
 
         # break down into parts
         [:from, :to].each do |part|
-          attr_reader_with_converter :"#{name}_#{part}", converter
+          attr_reader_with_converter :"#{name}_#{part}", converter, options
 
           define_method :"#{name}_#{part}?" do
             send(:"#{name}_#{part}").present?
@@ -127,22 +138,6 @@ module Riveter
           date_from && date_to
         end
 
-        # return from and to as range in UTC
-        define_method :"#{name}_utc" do
-          date_from = send(:"#{name}_from")
-          date_to = send(:"#{name}_to")
-          if date_from && date_to
-            if date_from == date_to
-              date = date_from.to_utc_date
-              DateTime.new(date.year, date.month, date.day, 0, 0, 0)..DateTime.new(date.year, date.month, date.day, 23, 59, 59)
-            else
-              date_from.to_utc_date..date_to.to_utc_date
-            end
-          else
-            nil
-          end
-        end
-
       end
 
       def attr_boolean(name, options={}, &block)
@@ -152,7 +147,7 @@ module Riveter
 
         converter = block_given? ? block : Converters.converter_for(:boolean)
 
-        attr_reader_with_converter name, converter
+        attr_reader_with_converter name, converter, options
         alias_method "#{name}?", name
 
         attr_writer name
@@ -160,7 +155,10 @@ module Riveter
         add_attr(name, :boolean, converter, options)
       end
 
+      # NB: enum must respond to values
       def attr_enum(name, enum, options={}, &block)
+        raise ArgumentError, 'enum' unless enum && enum.respond_to?(:values)
+
         options = {
           :enum => enum,
           :validate => true
@@ -169,18 +167,7 @@ module Riveter
         required = options[:required] == true
         converter = block_given? ? block : Converters.converter_for(:enum, options)
 
-        attr_reader_with_converter name, converter
-
-        # helpers
-        # TODO: would be nicer to emulate an association
-
-        define_singleton_method "#{name}_enum" do
-          enum
-        end
-
-        define_singleton_method name.to_s.pluralize do
-          enum.collection
-        end
+        attr_reader_with_converter name, converter, options
 
         validates name,
                   :allow_blank => !required,
@@ -203,7 +190,7 @@ module Riveter
 
         define_method name do
           array = instance_variable_get("@#{name}") || []
-          array.map {|v| converter.call(v) }
+          array.map {|v| converter.call(v, options) }
         end
 
         attr_writer name
@@ -222,7 +209,7 @@ module Riveter
 
         define_method name do
           hash = instance_variable_get("@#{name}") || {}
-          hash.merge(hash) {|k, v| converter.call(v) }
+          hash.merge(hash) {|k, v| converter.call(v, options) }
         end
 
         attr_writer name
@@ -230,65 +217,46 @@ module Riveter
         add_attr(name, :hash, converter, options)
       end
 
-      ##
-      # FIXME: this doesn't work as expected
-      #
-      def attr_model(name, model_or_scope, options={}, &block)
+      def attr_object(name, options={}, &block)
         options = {
-          :model => model_or_scope,
-          :validate => true,
-          :find_by => :id
+          :validate => true
         }.merge(options)
 
-        required = options[:required] == true
-        converter = if block_given?
-                      block
-                    elsif model_or_scope.respond_to?(:find_by)
-                      Converters.converter_for(:model, options)
-                    else
-                      Converters.converter_for(:object, options)
-                    end
-
-        # helpers
-        define_singleton_method "#{name}_model" do
-          model_or_scope
-        end
-
-        attr_reader_with_converter name, converter
-
-        # only add validation of the model instance if supported
-        if model_or_scope.instance_methods.include?(:valid?) && options[:validate]
-          validate :"validate_#{name}"
+        converter = block_given? ? block : Converters.converter_for(:object, options)
 
-          # need a "custom" associated validation since
-          # we don't reference active record...
-          define_method :"validate_#{name}" do
-            instance = self.send(name)
-            return unless required && instance.present?
-            self.errors.add(name, :invalid) unless instance.valid?
-          end
-        end
+        attr_reader_with_converter name, converter, options
 
         attr_writer name
 
-        add_attr(name, :model, converter, options)
+        add_attr(name, :object, converter, options)
       end
 
-      def attr_object(name, options={}, &block)
-        converter = block_given? ? block : Converters.converter_for(:object, options)
+      def attr_class(name, classes, options={}, &block)
+        options = {
+          :validate => true,
+          :classes => classes
+        }.merge(options)
+
+        required = options[:required] == true
+        converter = block_given? ? block : Converters.converter_for(:class, options)
 
-        attr_reader_with_converter name, converter
+        attr_reader_with_converter name, converter, options
+
+        validates name,
+                  :allow_blank => !required,
+                  :allow_nil => !required,
+                  :inclusion => { :in => classes } if options[:validate]
 
         attr_writer name
 
-        add_attr(name, :object, converter, options)
+        add_attr(name, :class, converter, options)
       end
 
     private
 
-      def attr_reader_with_converter(name, converter)
+      def attr_reader_with_converter(name, converter, options={})
         define_method name do
-          converter.call instance_variable_get("@#{name}")
+          converter.call(instance_variable_get("@#{name}"), options)
         end
       end
 
@@ -300,7 +268,7 @@ module Riveter
         required = options[:required] == true
         converter = block_given? ? block : Converters.converter_for(type)
 
-        attr_reader_with_converter name, converter
+        attr_reader_with_converter name, converter, options
 
         validates name,
                   :allow_blank => !required,
@@ -320,7 +288,7 @@ module Riveter
         required = options[:required] == true
         converter = block_given? ? block : Converters.converter_for(type)
 
-        attr_reader_with_converter name, converter
+        attr_reader_with_converter name, converter, options
 
         validates name,
                   :allow_blank => !required,
@@ -333,25 +301,28 @@ module Riveter
       end
 
       def add_attr(name, type, converter=nil, options={})
-        self._attributes[name] = attribute_info = AttributeInfo.new(name, type, converter, options)
+        self._attributes[name] = attribute_info = AttributeInfo.new(self, name, type, converter, options)
         validates name, :presence => true if attribute_info.required?
         attribute_info
       end
     end
 
-    class AttributeInfo < Struct.new(:name, :type, :converter, :options)
+    class AttributeInfo < Struct.new(:target, :name, :type, :converter, :options)
       def required?
         @required ||= (options[:required] == true)
       end
 
       def default
         @default ||= options[:default]
-        @default.respond_to?(:call) ? @default.call : @default
       end
 
       def default?
         !self.default.nil?
       end
+
+      def evaluate_default(scope)
+        default? && default.respond_to?(:call) ? scope.instance_exec(&default) : default
+      end
     end
 
     attr_reader :options
@@ -360,8 +331,7 @@ module Riveter
       # assign default values
       self.class._attributes.each do |name, attribute_info|
         next unless attribute_info.default?
-        value = attribute_info.default
-        send("#{name}=", value.respond_to?(:call) ? value.call : value)
+        send("#{name}=", attribute_info.evaluate_default(self))
       end
 
       @options = options.freeze
@@ -461,35 +431,35 @@ module Riveter
       def self.converter_for(data_type, options={})
         case data_type
         when :string
-          lambda {|v| v.to_s }
+          lambda {|v, opt| v.to_s }
 
         when :boolean
-          lambda {|v| v.to_b }
+          lambda {|v, opt| v.to_b }
 
         when :integer
-          lambda {|v| Integer(v) rescue v }
+          lambda {|v, opt| Integer(v) rescue v }
 
         when :decimal, :float
-          lambda {|v| Float(v) rescue v }
+          lambda {|v, opt| Float(v) rescue v }
 
         when :date
-          lambda {|v| Date.parse(v) rescue v }
+          lambda {|v, opt| Date.parse(v) rescue v }
 
         when :time
-          lambda {|v| Time.parse(v) rescue v }
+          lambda {|v, opt| Time.parse(v) rescue v }
 
         when :enum
-          lambda {|enum, v|
+          lambda {|enum, v, opt|
             enum.values.include?(v) ? v : enum.value_for(v)
           }.curry[options[:enum]]
 
-        when :model
-          lambda {|model, attrib, v|
-            v.is_a?(model) ? v : model.find_by(attrib => v)
-          }.curry[options[:model], options[:find_by]]
+        when :class
+          lambda {|models, v, opt|
+            models[v] || v
+          }.curry[options[:classes].inject({}) {|list, klass| list[klass.name] = klass; list }]
 
         else # object etc...
-          lambda {|v| v }
+          lambda {|v, opt| v }
         end
       end
 

data/lib/riveter/version.rb

@@ -1,3 +1,3 @@
 module Riveter
-  VERSION = "0.3.0"
+  VERSION = "0.6.0"
 end

data/spec/examples/attribute_examples.rb

@@ -13,7 +13,7 @@ shared_examples_for "an attribute" do |type, default_value, *args, &block|
 
     describe "with" do
       before do
-        subject.send :"attr_#{type}", name, *args
+        subject.send :"attr_#{type}", name, *args, options
       end
 
       it { subject.attributes.should include(name.to_s) }
@@ -60,7 +60,7 @@ shared_examples_for "an attribute" do |type, default_value, *args, &block|
       end
 
       it {
-        expect(mock_block).to receive(:call).at_least(:once)
+        expect(mock_block).to receive(:call).at_least(:once).with(anything, instance_of(Hash))
         instance.send(name)
       }
     end

data/spec/riveter/attribute_default_value_spec.rb

@@ -23,11 +23,19 @@ describe Riveter::AttributeDefaultValues do
 
       it "should have own registration" do
         expect {
-          Class.new(ActiveRecord::Base).class_eval do |klass|
+          Class.new.class_eval do |klass|
+
+            # provide mock method for after_initialize
+            class << self
+              def after_initialize(*args)
+              end
+            end
+
             include Riveter::AttributeDefaultValues
 
             attr_accessor :attr_name
             default_value_for :attr_name, 1
+
           end
         }.to_not change { subject.attribute_defaults.length }
       end

data/spec/riveter/attributes_spec.rb

@@ -84,6 +84,8 @@ describe Riveter::Attributes do
 
         it { instance.should respond_to(:an_attribute_to?) }
 
+        it { instance.should respond_to(:an_attribute_present?) }
+
         it {
           instance.an_attribute = nil
           instance.an_attribute_to?.should be_falsey
@@ -93,7 +95,85 @@ describe Riveter::Attributes do
           instance.an_attribute_to = Date.today
           instance.an_attribute_to?.should be_truthy
         }
+
+        it {
+          instance.an_attribute_from = Date.today
+          instance.an_attribute_to = Date.today
+          instance.an_attribute_present?.should be_truthy
+        }
+
+        it {
+          instance.an_attribute_from = nil
+          instance.an_attribute_to = Date.today
+          instance.an_attribute_present?.should be_falsey
+        }
+
+        it {
+          instance.an_attribute_from = Date.today
+          instance.an_attribute_to = nil
+          instance.an_attribute_present?.should be_falsey
+        }
+
+        it {
+          instance.an_attribute_from = Date.today
+          instance.an_attribute_to = Date.today
+          instance.an_attribute_present?.should be_truthy
+        }
+
+      end
+
+      describe "#min" do
+        before do
+          subject.attr_date_range :an_attribute_value, :min => 1
+          subject.attr_date_range :an_attribute_block, :min => lambda { self.some_method }
+        end
+
+        let(:instance) { subject.new() }
+
+        it { instance.should respond_to(:an_attribute_value_min) }
+        it { instance.should respond_to(:an_attribute_value_min=) }
+
+        it {
+          instance.an_attribute_value_min.should eq(1)
+        }
+
+        it {
+          instance.an_attribute_value_min = 2
+          instance.an_attribute_value_min.should eq(2)
+        }
+
+        it "invokes the lambda in the context of self" do
+          expect(instance).to receive(:some_method)
+          instance.an_attribute_block_min
+        end
       end
+
+      describe "#max" do
+        before do
+          subject.attr_date_range :an_attribute_value, :max => 1
+          subject.attr_date_range :an_attribute_block, :max => lambda { self.some_method }
+        end
+
+        let(:instance) { subject.new() }
+
+        it { instance.should respond_to(:an_attribute_value_max) }
+        it { instance.should respond_to(:an_attribute_value_max=) }
+
+        it {
+          instance.an_attribute_value_max.should eq(1)
+        }
+
+        it {
+          instance.an_attribute_value_max = 2
+          instance.an_attribute_value_max.should eq(2)
+        }
+
+        it "invokes the lambda in the context of self" do
+          expect(instance).to receive(:some_method)
+          instance.an_attribute_block_max
+        end
+      end
+
     end
 
     it_should_behave_like "an attribute", :time, Time.new(2010, 1, 12, 8, 4, 45) do
@@ -125,12 +205,7 @@ describe Riveter::Attributes do
         end
         let(:instance) { subject.new() }
 
-        it { instance.should ensure_inclusion_of(:product_type).in_array(TestEnum.values) }
-
-        it { should respond_to(:product_type_enum)}
-        it { subject.product_type_enum.should eq(TestEnum) }
-        it { should respond_to(:product_types)}
-        it { subject.product_types.should eq(TestEnum.collection)}
+        it { instance.should validate_inclusion_of(:product_type).in_array(TestEnum.values) }
       end
     end
 
@@ -144,44 +219,23 @@ describe Riveter::Attributes do
       let(:expected_value) { {:c => 1, :d => 2} }
     end
 
-    it_should_behave_like "an attribute", :model, TestModel.new(), TestModel do
-      let(:assigned_value) { TestModel.new() }
+    it_should_behave_like "an attribute", :object, Object.new() do
+      let(:assigned_value) { Object.new() }
+    end
 
-      before do
-        allow_any_instance_of(TestModel).to receive(:valid?) { true }
-        allow(TestModel).to receive(:find_by)
-      end
+    it_should_behave_like "an attribute", :class, TestModel, [TestModel, TestModelWithAttributeDefaultValues] do
+      let(:assigned_value) { "TestModelWithAttributeDefaultValues" }
+      let(:expected_value) { TestModelWithAttributeDefaultValues }
 
       describe "additional" do
         before do
-          subject.attr_model :product, TestModel, :required => true
+          subject.attr_class :an_attribute, [TestModel, TestModelWithAttributeDefaultValues], :required => true
         end
+        let(:instance) { subject.new() }
 
-        it { should respond_to(:product_model)}
-        it { subject.product_model.should eq(TestModel) }
-
-        it {
-          allow(TestModel).to receive(:find_by).with(:id => 1) { assigned_value }
-
-          instance = subject.new()
-          instance.product = 1
-          instance.product.should eq(assigned_value)
-        }
-
-        it {
-          allow(TestModel).to receive(:find_by).with(:id => 1) { assigned_value }
-          expect(assigned_value).to receive(:valid?) { true }
-
-          instance = subject.new()
-          instance.product = 1
-          instance.valid?
-        }
+        it { instance.should validate_inclusion_of(:an_attribute).in_array([TestModel, TestModelWithAttributeDefaultValues]) }
       end
     end
-
-    it_should_behave_like "an attribute", :object, Object.new() do
-      let(:assigned_value) { Object.new() }
-    end
   end
 
   describe "instance" do
@@ -202,7 +256,6 @@ describe Riveter::Attributes do
         subject.enum.should eq(TestEnum::Member1)
         subject.array.should eq([1, 2, 3])
         subject.hash.should eq({:a => :b})
-        subject.model.should eq(TestModel)
         subject.object.should eq('whatever')
       end
     end
@@ -225,8 +278,8 @@ describe Riveter::Attributes do
           'enum' => TestEnum::Member1,
           'array' => [1, 2, 3],
           'hash' => {:a => :b},
-          'model' => TestModel,
-          'object' => 'whatever'
+          'object' => 'whatever',
+          'with_lambda_default' => subject
         })
       }
     end

data/spec/spec_helper.rb

@@ -15,7 +15,6 @@ SimpleCov.start do
 end
 
 require 'pry'
-require 'active_record'
 
 require 'riveter'
 require 'riveter/spec_helper'
@@ -25,8 +24,17 @@ require 'riveter/form_builder_extensions'
 require 'riveter/command_routes'
 require 'riveter/enquiry_routes'
 
-require 'rails/all'
+# require 'rails/all'
+
+# require 'active_record/railtie'
+require 'action_controller/railtie'
+require 'action_view/railtie'
+# require 'action_mailer/railtie'
+# require 'active_job/railtie'
+# require 'rails/test_unit/railtie'
+# require 'sprockets/railtie'
 require 'rails/generators'
+
 require 'haml'
 
 require 'shoulda/matchers'
@@ -50,6 +58,7 @@ RSpec.configure do |config|
 
   # config.order = :random
   config.fail_fast = (ENV["FAIL_FAST"] == 1)
+
 end
 
 # require examples, must happen after configure for RSpec 3

data/spec/support/test_class_with_attributes.rb

@@ -15,7 +15,8 @@ class TestClassWithAttributes
   attr_enum :enum, TestEnum, :default => TestEnum::Member1
   attr_array :array, :default => [1, 2, 3]
   attr_hash :hash, :default => {:a => :b}
-  attr_model :model, TestModel, :default => TestModel
   attr_object :object, :default => 'whatever'
 
+  attr_object :with_lambda_default, :default => lambda { self }
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riveter
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Chris Stefano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-07 00:00:00.000000000 Z
+date: 2016-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties