easy_attributes 0.1.0 → 0.1.2

data/README.rdoc

@@ -37,7 +37,7 @@ Declaration:
 
 will define:
   field()              # => value  ### if orm == :attr, attr_accessor will be installed for the attribute
-  field=(value)        # => value
+  field=(value)        # => value  ### for active_model classes
   field_sym()          # => :name
   field_sym=(symbol)   # => value
   field_values()       # => {:name=>value, ...}

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.2

data/easy_attributes.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{easy_attributes}
-  s.version = "0.1.0"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Allen Fair"]
-  s.date = %q{2010-04-28}
+  s.date = %q{2010-07-29}
   s.description = %q{Easy Attributes is a Ruby DSL to give more control to attributes.}
   s.email = %q{allen.fair@gmail.com}
   s.extra_rdoc_files = [
@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/afair/easy_attributes}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Easy Attributes for Ruby}
   s.test_files = [
     "test/helper.rb",
@@ -42,7 +42,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
     else
     end
   else

data/lib/easy_attributes.rb

@@ -3,8 +3,6 @@ module EasyAttributes
   
   def self.included(base) #:nodoc:
     base.extend( ClassMethods )
-    #EasyAttributes::Config
-    #puts "easy_attributes included into #{base}"
   end
   
   # Configuration class for EasyAttributes, set at load time.
@@ -91,6 +89,8 @@ module EasyAttributes
       code = ''
       if EasyAttributes::Config.orm == :active_model
         validates_inclusion_of attribute, :in=>hash.values
+        # Add named_scope (scope) for each value
+        hash.each { |k,v| code += "named_scope :#{k}, :conditions=>{:#{attribute}=>#{v.inspect}}\n" }
       else
         attr_accessor attribute
       end
@@ -105,9 +105,16 @@ module EasyAttributes
           EasyAttributes::Config.attributes["#{name}"]
         end
         def #{attribute}_is?(*args)
-          EasyAttributes.value_is?("#{name}", attribute, *args)
+          EasyAttributes.value_is?("#{name}", #{attribute}, *args)
         end
       )
+      if EasyAttributes::Config.orm == :active_model
+        code += %Q(
+          def #{attribute}=(v)
+            self[:#{attribute}] = v.is_a?(Symbol) ? EasyAttributes.value_for_sym("#{attribute}", v) : v; 
+          end
+        )
+      end
       #puts code
       class_eval code
     end
@@ -195,6 +202,7 @@ module EasyAttributes
   # Returns the defined symbol for the given value on the attribute
   def self.sym_for_value(attribute, value)
     EasyAttributes::Config.attributes[attribute].each {|k,v| return k if v==value}
+    raise "EasyAttribute #{attribute} symbol not found for #{value}"
   end
   
   def self.value_is?(attribute, value, *args)
@@ -212,7 +220,7 @@ module EasyAttributes
     #when :not, :not_in
     #  ! args.include? EasyAttributes::Config.attributes[attribute].keys
     else
-      args.include? EasyAttributes.sym_for_value(v)
+      args.include? EasyAttributes.sym_for_value(attribute, value)
     end
   end
   

data/test/test_easy_attributes.rb

@@ -21,6 +21,10 @@ class TestEasyAttributes < Test::Unit::TestCase
     self.tav_sym = :k2
     assert_equal tav, 2
     assert_equal tav_sym, :k2
+    assert_equal tav_is?(:k2), true
+    assert_equal tav_is?(:k1, :k3), false
+    #self.tav = :k1
+    #assert_equal tav, 1
   end
   
   def test_like

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: easy_attributes
 version: !ruby/object:Gem::Version 
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Allen Fair
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-28 00:00:00 -04:00
+date: 2010-07-29 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -48,23 +49,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Easy Attributes for Ruby