active_hash 0.9.3 → 0.9.4

data/CHANGELOG

@@ -1,3 +1,7 @@
+2011-06-05
+  - fixed deprecation warnings for class_inheritable_accessor (thanks scudco!)
+  - added basic compatibility with the `where` method from Arel (thanks rgarver!)
+
 2011-04-19
   - better dependency management and compatibility with ActiveSupport 2.x (thanks vandrijevik!)
 

data/README.md

@@ -290,7 +290,7 @@ The two methods you need to implement are load_file, which needs to return an ar
 Setting the default file location in Rails:
 
     # config/initializers/active_file.rb
-    ActiveFile.set_root_path "config/activefiles"
+    ActiveFile::Base.set_root_path "config/activefiles"
 
 In Rails, in development mode, it reloads the entire class, which reloads the file.  In production, the data cached in memory.
 

data/lib/active_file/base.rb

@@ -1,7 +1,12 @@
 module ActiveFile
 
   class Base < ActiveHash::Base
-    class_inheritable_accessor :filename, :root_path, :data_loaded
+
+    if respond_to?(:class_attribute)
+      class_attribute :filename, :root_path, :data_loaded
+    else
+      class_inheritable_accessor :filename, :root_path, :data_loaded
+    end
 
     class << self
 
@@ -10,6 +15,11 @@ module ActiveFile
         super
       end
 
+      def where(options)
+        reload unless data_loaded
+        super
+      end
+
       def delete_all
         self.data_loaded = true
         super
@@ -23,11 +33,11 @@ module ActiveFile
       end
 
       def set_filename(name)
-        write_inheritable_attribute :filename, name
+        self.filename = name
       end
 
       def set_root_path(path)
-        write_inheritable_attribute :root_path, path
+        self.root_path = path
       end
 
       def load_file
@@ -35,9 +45,9 @@ module ActiveFile
       end
 
       def full_path
-        root_path = read_inheritable_attribute(:root_path)  || Dir.pwd
-        filename  = read_inheritable_attribute(:filename)   || name.tableize
-        File.join(root_path, "#{filename}.#{extension}")
+        actual_root_path = root_path  || Dir.pwd
+        actual_filename  = filename   || name.tableize
+        File.join(actual_root_path, "#{actual_filename}.#{extension}")
       end
 
       def extension

data/lib/active_hash/base.rb

@@ -7,7 +7,12 @@ module ActiveHash
   end
 
   class Base
-    class_inheritable_accessor :data, :dirty
+
+    if respond_to?(:class_attribute)
+      class_attribute :_data, :dirty
+    else
+      class_inheritable_accessor :_data, :dirty
+    end
 
     if Object.const_defined?(:ActiveModel)
       extend ActiveModel::Naming
@@ -29,10 +34,14 @@ module ActiveHash
         end
       end
 
+      def data
+        _data
+      end
+
       def data=(array_of_hashes)
         mark_dirty
         @records = nil
-        write_inheritable_attribute(:data, array_of_hashes)
+        self._data = array_of_hashes
         if array_of_hashes
           auto_assign_fields(array_of_hashes)
           array_of_hashes.each do |hash|
@@ -74,14 +83,18 @@ module ActiveHash
 
       def all(options={})
         if options.has_key?(:conditions)
-          (@records || []).select do |record|
-            options[:conditions].all? {|col, match| record[col] == match}
-          end
+          where(options[:conditions])
         else
           @records || []
         end
       end
 
+      def where(options)
+        (@records || []).select do |record|
+          options.all? {|col, match| record[col] == match}
+        end
+      end
+
       def count
         all.length
       end
@@ -272,7 +285,7 @@ module ActiveHash
       end
 
       def reload
-        self.data = read_inheritable_attribute(:data)
+        self.data = _data
         mark_clean
       end
 

data/lib/active_hash/version.rb

@@ -1,5 +1,5 @@
 module ActiveHash
   module Gem
-    VERSION = "0.9.3"
+    VERSION = "0.9.4"
   end
 end

data/spec/active_hash/base_spec.rb

@@ -191,6 +191,53 @@ describe ActiveHash, "Base" do
     end
   end
 
+  describe ".where" do
+    before do
+      Country.field :name
+      Country.field :language
+      Country.data = [
+        {:id => 1, :name => "US", :language => 'English'},
+        {:id => 2, :name => "Canada", :language => 'English'},
+        {:id => 2, :name => "Mexico", :language => 'Spanish'}
+      ]
+    end
+
+    it "raises ArgumentError if no conditions are provided" do
+      lambda{
+        Country.where
+      }.should raise_error(ArgumentError)
+    end
+
+    it "returns all data as inflated objects" do
+      Country.where(:language => 'English').all? { |country| country.should be_kind_of(Country) }
+    end
+
+    it "populates the data correctly" do
+      records = Country.where(:language => 'English')
+      records.first.id.should == 1
+      records.first.name.should == "US"
+      records.last.id.should == 2
+      records.last.name.should == "Canada"
+    end
+
+    it "re-populates the records after data= is called" do
+      Country.data = [
+        {:id => 45, :name => "Canada"}
+      ]
+      records = Country.where(:name => 'Canada')
+      records.first.id.should == 45
+      records.first.name.should == "Canada"
+      records.length.should == 1
+    end
+
+    it "filters the records from a AR-like conditions hash" do
+      record = Country.where(:name => 'US')
+      record.count.should == 1
+      record.first.id.should == 1
+      record.first.name.should == 'US'
+    end
+  end
+
   describe ".count" do
     before do
       Country.data = [

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: active_hash
 version: !ruby/object:Gem::Version 
-  hash: 61
   prerelease: 
-  segments: 
-  - 0
-  - 9
-  - 3
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors: 
 - Jeff Dean
@@ -40,11 +35,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 2
-        - 2
         version: 2.2.2
   type: :runtime
   version_requirements: *id001
@@ -91,18 +81,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   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: []