ambry 0.2.0 → 0.2.1

data/Changelog.md

@@ -1,5 +1,12 @@
 # Ambry Changelog
 
+## [0.2.1](https://github.com/norman/ambry/tree/0.2.1) - 2001-09-20 ([diff](https://github.com/norman/ambry/compare/0.2.0...0.2.1))
+
+### [Norman Clarke](https://github.com/norman)
+
+* Fix handling of attributes with falsy values
+
+
 ## [0.2.0](https://github.com/norman/ambry/tree/0.2.0) - 2001-09-05 ([diff](https://github.com/norman/ambry/compare/0.1.2...0.2.0))
 
 ### [Norman Clarke](https://github.com/norman)

data/README.md

@@ -59,6 +59,14 @@ quick samples.
     first_alphabetical          = Country.alphabetical.first
     last_alphabetical           = Country.alphabetical.last
 
+## When should I use Ambry?
+
+Ambry can be useful for refactoring code with large hash constants and long case
+statements. Sometimes it's hard to figure out where code ends and data begins,
+but if your code looks like it could be simplified significantly by putting some
+things in a data store, yet it's not enough data to justify something like
+SQLite, then Ambry could be a good fit.
+
 
 ## Installation
 

data/extras/bench.rb

@@ -6,8 +6,6 @@ require "ambry"
 
 N = 500
 
-Ambry::Adapter.new
-
 class Person
   extend Ambry::Model
   field :email, :name, :age

data/lib/ambry/active_model.rb

@@ -114,8 +114,8 @@ module Ambry
         run_callbacks(:destroy) { delete }
       end
 
-      def update_attributes
-        run_callbacks(:save) { update }
+      def update_attributes(*args)
+        run_callbacks(:save) { update(*args) }
       end
     end
   end

data/lib/ambry/hash_proxy.rb

@@ -6,14 +6,25 @@ module Ambry
   class HashProxy
     attr :hash
 
+    def self.with(hash, &block)
+      new.with(hash, &block)
+    end
+
     # Allows accessing a hash attribute as a method.
     def method_missing(symbol)
       hash[symbol] or hash[symbol.to_s] or raise NoMethodError
     end
 
     # Allows accessing a hash attribute as hash key, either a string or symbol.
-    def [](value)
-      hash[value || value.to_sym || value.to_s]
+    def [](key)
+      if hash.key?(key)           then hash[key]
+      elsif hash.key?(key.to_sym) then hash[key.to_sym]
+      elsif hash.key?(key.to_s)   then hash[key.to_s]
+      end
+    end
+
+    def key?(key)
+      hash.key?(key) or hash.key?(key.to_sym) or hash.key?(key.to_s)
     end
 
     # Remove the hash.

data/lib/ambry/model.rb

@@ -27,7 +27,7 @@ module Ambry
           attribute_names << name.to_sym
           class_eval(<<-EOM, __FILE__, __LINE__ + 1)
             def #{name}
-              @#{name} or (@attributes[:#{name}] || @attributes['#{name}'] if @attributes)
+              defined?(@#{name}) ? @#{name} : @attributes[:#{name}]
             end
 
             def #{name}=(value)
@@ -152,9 +152,10 @@ module Ambry
 
       # Update this instance's attributes and invoke #save.
       def update(attributes)
-        self.class.attribute_names.each do |name|
-          value = attributes[name] || attributes[name.to_s]
-          send("#{name}=", value) if value
+        HashProxy.with(attributes) do |proxy|
+          self.class.attribute_names.each do |name|
+            send("#{name}=", proxy[name]) if proxy.key?(name)
+          end
         end
         save
       end

data/lib/ambry/version.rb

@@ -2,7 +2,7 @@ module Ambry
   module Version
     MAJOR  = 0
     MINOR  = 2
-    TINY   = 0
+    TINY   = 1
     BUILD  = nil
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
   end

data/spec/model_spec.rb

@@ -150,6 +150,12 @@ describe Ambry::Model do
       assert_equal count, Person.count
     end
 
+    it "should allow false as an update value (regression)" do
+      p = Person.get("moe@3stooges.com")
+      p.update(:name => false)
+      assert_equal false, p.name
+    end
+
   end
 
   describe "#save" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ambry
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-05 00:00:00.000000000 Z
+date: 2011-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffaker
-  requirement: &70333211234400 !ruby/object:Gem::Requirement
+  requirement: &70104361299880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70333211234400
+  version_requirements: *70104361299880
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70333211233680 !ruby/object:Gem::Requirement
+  requirement: &70104361299380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.2.2
   type: :development
   prerelease: false
-  version_requirements: *70333211233680
+  version_requirements: *70104361299380
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70333211232940 !ruby/object:Gem::Requirement
+  requirement: &70104361298940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70333211232940
+  version_requirements: *70104361298940
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70333211232060 !ruby/object:Gem::Requirement
+  requirement: &70104361298360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70333211232060
+  version_requirements: *70104361298360
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70333211231280 !ruby/object:Gem::Requirement
+  requirement: &70104361297820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70333211231280
+  version_requirements: *70104361297820
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70333211230900 !ruby/object:Gem::Requirement
+  requirement: &70104361297440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70333211230900
+  version_requirements: *70104361297440
 description: ! "    Ambry is not an ORM, man! It's a database and ORM replacement
   for (mostly)\n    static models and small datasets. It provides ActiveModel compatibility,
   and\n    flexible searching and storage.\n"
@@ -137,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ! '[none]'
-rubygems_version: 1.8.6
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: An ActiveModel-compatible ORM-like library for storing model instances in