ambry 0.1.0 → 0.1.1

data/Changelog.md

@@ -1,5 +1,18 @@
 # Ambry Changelog
 
-## 0.1.0 - NOT RELEASED YET
+## [0.1.1](https://github.com/norman/ambry/tree/0.1.1) - 2011-08-24 ([diff](https://github.com/norman/ambry/compare/0.1.0...0.1.1))
 
-Initial release.
+### [Esad Hajdarevic](https://github.com/esad)
+
+* Allow attribute keys to be strings
+* Pass key as attribute when loading database. This allows you to avoid specifying the key twice when manually editing a YAML file.
+* Remove use of String#blank? to avoid depending on Active Support
+
+### [Ignacio Carrera](https://github.com/nachokb)
+
+* Added #last and #inspect
+
+
+## [0.1.0](https://github.com/norman/ambry/tree/0.1.0) - 2011-08-18
+
+Initial release.

data/README.md

@@ -15,6 +15,9 @@ quick samples.
 
 ## A quick tour
 
+    # Initialize a default adapter.
+    Ambry::Adapter.new
+
     # Create a model.
     class Country
       # Turn any Ruby object into a Ambry model by extending this module.
@@ -32,6 +35,10 @@ quick samples.
         def in_region(region)
           find {|c| c.region == region)
         end
+
+        def alphabetical
+          sort_by {|c| c.name}
+        end
       end
 
       # Root filter, can be used to setup relations.
@@ -51,6 +58,9 @@ quick samples.
     # Do some searches
     big_asian_countries         = Country.big.in_region(:asia)
     countries_that_start_with_c = Country.find {|c| c.name =~ /^C/}
+    # #first and #last only make sense if you run Ruby 1.9 (creation order) or explicitly specified an order
+    first_alphabetical          = Country.alphabetical.first
+    last_alphabetical           = Country.alphabetical.last
 
 
 ## Installation

data/extras/cookie_demo.rb

@@ -54,8 +54,8 @@ get "/books/:slug" do |slug|
 end
 
 post "/books" do
-  Book.delete params[:slug] unless params[:slug].blank?
-  @book = Book.create params unless params[:title].blank?
+  Book.delete params[:slug] if params[:slug]
+  @book = Book.create params if params[:title]
   redirect "/"
 end
 

data/lib/ambry/abstract_key_set.rb

@@ -41,6 +41,12 @@ module Ambry
       block_given? ? all.detect(&block) : all.first
     end
 
+    # With no block, returns an instance for the first key. If a block is given,
+    # it returns the first instance yielding a true value.
+    def last(&block)
+      block_given? ? all.reverse.detect(&block) : all.last
+    end
+
     # With no block, returns the number of keys. If a block is given, counts the
     # number of elements yielding a true value.
     def count(&block)
@@ -99,6 +105,14 @@ module Ambry
       @callable = callable
     end
 
+    def reverse
+      KeyIterator.new(keys.reverse, &callable)
+    end
+
+    def last
+      callable.call keys.last
+    end
+
     def each(&block)
       block_given? ? keys.each {|k| yield callable.call(k)} : to_enum
     end

data/lib/ambry/adapters/cookie.rb

@@ -39,7 +39,7 @@ module Ambry
       end
 
       def import_data
-        data.blank? ? {} : Marshal.load(Zlib::Inflate.inflate(verifier.verify(data)))
+        (!data || data.empty?) ? {} : Marshal.load(Zlib::Inflate.inflate(verifier.verify(data)))
       end
 
       def load_database

data/lib/ambry/adapters/file.rb

@@ -14,7 +14,7 @@ module Ambry
 
       def load_database
         @db = import_data
-        @db.blank? ? @db = {} : @db.map(&:freeze)
+        (!@db || @db.empty?) ? @db = {} : @db.map(&:freeze)
       rescue Errno::ENOENT
         # @TODO warn via logger when file doesn't exist
         @db = {}

data/lib/ambry/hash_proxy.rb

@@ -8,7 +8,7 @@ module Ambry
 
     # Allows accessing a hash attribute as a method.
     def method_missing(symbol)
-      hash[symbol] or raise NoMethodError
+      hash[symbol] or hash[symbol.to_s] or raise NoMethodError
     end
 
     # Allows accessing a hash attribute as hash key, either a string or symbol.

data/lib/ambry/mapper.rb

@@ -8,7 +8,7 @@ module Ambry
     attr :hash
     attr_accessor :adapter_name, :klass, :indexes, :options
     def_delegators :hash, :clear, :delete
-    def_delegators :key_set, :all, :count, :find, :find_by_key, :first, :keys
+    def_delegators :key_set, :all, :count, :find, :find_by_key, :first, :last, :keys
 
     def initialize(klass, adapter_name = nil, options = {})
       @klass        = klass
@@ -51,7 +51,7 @@ module Ambry
 
     # Get an instance by key
     def get(key)
-      klass.send :from_hash, self[key]
+      klass.send :from_hash, self[key].merge(klass.id_method => key)
     end
 
     def key_set

data/lib/ambry/model.rb

@@ -17,7 +17,7 @@ module Ambry
       attr_accessor :attribute_names, :id_method, :mapper
       attr_reader :key_class
       def_delegators(*[:find, Enumerable.public_instance_methods(false)].flatten)
-      def_delegators(:mapper, :[], :all, :delete, :first, :get, :count, :find, :find_by_key, :keys)
+      def_delegators(:mapper, :[], :all, :delete, :first, :last, :get, :count, :find, :find_by_key, :keys)
       alias id_field id_method=
 
       def field(*names)
@@ -27,7 +27,7 @@ module Ambry
           attribute_names << name.to_sym
           class_eval(<<-EOM, __FILE__, __LINE__ + 1)
             def #{name}
-              @#{name} or (@attributes[:#{name}] if @attributes)
+              @#{name} or (@attributes[:#{name}] || @attributes['#{name}'] if @attributes)
             end
 
             def #{name}=(value)
@@ -89,6 +89,10 @@ module Ambry
           @mapper ||= Mapper.new(self, name, options)
         end
       end
+
+      def inspect
+        "#{name}(#{attribute_names * ', '})"
+      end
     end
 
     module InstanceMethods
@@ -159,6 +163,10 @@ module Ambry
       def delete
         self.class.delete(self.to_id)
       end
+
+      def inspect
+        "#<#{self.class.name} #{self.class.attribute_names.map { |attr| "#{attr}: #{self.send(attr).inspect}" } * ', ' }>"
+      end
     end
   end
 end

data/lib/ambry/version.rb

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

data/spec/fixtures.yml

@@ -1,17 +1,13 @@
 ---
 Person:
   moe@3stooges.com:
-      :name: Moe Howard
-      :email: moe@3stooges.com
+    :name: Moe Howard
   shemp@3stooges.com:
-      :name: Shemp Howard
-      :email: shemp@3stooges.com
+    :name: Shemp Howard
   curly@3stooges.com:
-      :name: Curly Howard
-      :email: curly@3stooges.com
+    :name: Curly Howard
   larry@3stooges.com:
-      :name: Larry Fine
-      :email: larry@3stooges.com
+    :name: Larry Fine
 "MyModule::Animal":
   Canis Familaris:
     :species: Canis Familaris

data/spec/key_set_spec.rb

@@ -35,11 +35,21 @@ describe Ambry::AbstractKeySet do
 
   describe "#first" do
     it "should return the first matching instance when called with a block" do
-      assert_equal "Curly Howard", Person.first {|p| p.name =~ /Curly/}.name
+      assert_equal "Curly Howard", Person.alphabetical.first {|p| p.name =~ /Curly/}.name
     end
 
     it "should return the first instance when not called with a block" do
-      assert_kind_of Person, Person.first
+      assert_kind_of Person, Person.alphabetical.first
+    end
+  end
+
+  describe "#last" do
+    it "should return the last matching instance when called with a block" do
+      assert_equal "Shemp Howard", Person.alphabetical.last {|p| p.name =~ /Howard/}.name
+    end
+
+    it "should return the last instance when not called with a block" do
+      assert_kind_of Person, Person.alphabetical.last
     end
   end
 

data/spec/spec_helper.rb

@@ -23,7 +23,11 @@ class Person
 
   filters do
     def non_howards
-      find {|p| p[:name] !~ /Howard/}
+      find {|p| p.name !~ /Howard/}
+    end
+
+    def alphabetical
+      sort_by {|p| p.name}
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ambry
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-18 00:00:00.000000000 -03:00
-default_executable: 
+date: 2011-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffaker
-  requirement: &70280928791740 !ruby/object:Gem::Requirement
+  requirement: &70346028569780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70280928791740
+  version_requirements: *70346028569780
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70280928790160 !ruby/object:Gem::Requirement
+  requirement: &70346028569280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +32,10 @@ dependencies:
         version: 2.2.2
   type: :development
   prerelease: false
-  version_requirements: *70280928790160
+  version_requirements: *70346028569280
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70280928788880 !ruby/object:Gem::Requirement
+  requirement: &70346028568860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70280928788880
+  version_requirements: *70346028568860
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70280928787220 !ruby/object:Gem::Requirement
+  requirement: &70346028568320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +54,10 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70280928787220
+  version_requirements: *70346028568320
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70280928786280 !ruby/object:Gem::Requirement
+  requirement: &70346028567820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +65,10 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70280928786280
+  version_requirements: *70346028567820
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70280928785640 !ruby/object:Gem::Requirement
+  requirement: &70346028567440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70280928785640
+  version_requirements: *70346028567440
 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"
@@ -107,8 +106,8 @@ files:
 - lib/ambry/mapper.rb
 - lib/ambry/model.rb
 - lib/ambry/version.rb
-- lib/generators/norman_generator.rb
-- lib/rack/norman.rb
+- lib/generators/ambry_generator.rb
+- lib/rack/ambry.rb
 - spec/active_model_spec.rb
 - spec/adapter_spec.rb
 - spec/cookie_adapter_spec.rb
@@ -118,7 +117,6 @@ files:
 - spec/mapper_spec.rb
 - spec/model_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/norman/ambry
 licenses: []
 post_install_message: 
@@ -139,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ! '[none]'
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: An ActiveModel-compatible ORM-like library for storing model instances in