active_hash 1.2.3 → 1.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjFhNmFkYzdjYTBlYjE0MDM1NWU2YTUwZjY1MWJkN2Q2YmNmNGRiOQ==
+    ODAxNDcxMTI0NjIwNDQ3ZjJjZmVkYmY1Yjc2NGQ5MDZjMTBjNDAzZg==
   data.tar.gz: !binary |-
-    M2RiMDQ0ODQxYTBhMDY2YzQ0YmI5OTgxZjVjNDA0OTMwNTA2OThjMA==
+    YzA5OWQ3YjMzNGQ5MzM0NzhkZjk3ZDJmODFiMDdkMzA0YTRiODc5OA==
 SHA512:
   metadata.gz: !binary |-
-    NzI2ODRiYTMxYTI3YWNjMjEyM2JjMjU3ZmRiYmRlMjllYTIzYzJmNzMyOGE2
-    MjZjNzM4MGRhYjhhNTcwMDIxZmI4MTdkNTEzYTg2NDZlOWNmOGQ1MjQ0YTgw
-    MTZiZDE2MmM3ZDk5NmM4MDJmODk1YzNiMDQ0OTJiMjhlOWNjNzg=
+    YjNkMzdjMmY5MjYwYTg4ZGJmMzJkM2I1Y2QxYjRlYTQzODc2ZWFlNjY5ODA3
+    MTk3NWE4MGIyYTc1ZDhjYzYxYTc0MDkyYWU5MTE4NTg2ODhiZGE5NjhlYWM1
+    YWQ4OTJmYWJlOWUyZGE4NzMwZTkwNTdhMGJlYmFjOTljYzI2Njk=
   data.tar.gz: !binary |-
-    ZDI3ZjMzM2UwNmM1N2QyY2ExZGRiZDM4MjFmZTBmMzJiNTU5ZmExOTQ3OGU4
-    ZDc5YjYyZDNmMGE3MjlmMjZkODgzZjNhNzkxM2E5YjEzZjJhNGMxZmQxOTVk
-    MzhkN2ZiYjdiODQ2MjliMGEzNjJkNGZmOWQ2ZThjMzkyZjhhODM=
+    YzAzMzJlMTYzNmVlYzA2NDBjYmMxZTViOWNjNmMzNDNlNGFjMTUwZGUzYTk4
+    NDViYjk2MTUzYzZmZTNjOGNlNTUwZDM4NDA5ZjE5MzM0NTkxN2ZhNTljMjc1
+    ZGFjYWRkODJiMjNiMGJiN2Q1Njc2MGExNmE0MWJhMDUxOTdhOWI=

data/CHANGELOG

@@ -1,3 +1,9 @@
+2014-02-18 (v1.3.0)
+  - fix bug where including ActiveHash associations would make `belongs_to :imageable, polymorphic: true` blow up
+  - fixed several bugs that prevented active hash from being used without active record / active model
+  - add support for splitting up data sources into multiple files (rheaton)
+  - add support for storing data in json files (rheaton)
+
 2013-11-29 (v1.2.3)
   - fix bug where active hash would call `.all` on models when setting has_many (grosser)
 

data/README.md

@@ -62,10 +62,6 @@ You can also use _add_:
       add :id => 2, :name => "Canada"
     end
 
-## WARNING
-
-If you add data to an ActiveHash file during an initializer, it will not be reloaded in development in Rails.
-
 ## Auto-Defined fields
 
 ActiveHash will auto-define all fields for you when you load the hash.  For example, if you have the following class:
@@ -105,10 +101,12 @@ You can define data inside your class or outside.  For example, you might have a
     end
 
     # config/initializers/data.rb
-    Country.data = [
-        {:id => 1, :name => "US"},
-        {:id => 2, :name => "Canada"}
-    ]
+    Rails.application.config.to_prepare do
+      Country.data = [
+          {:id => 1, :name => "US"},
+          {:id => 2, :name => "Canada"}
+      ]
+    end
 
 If you prefer to store your data in YAML, see below.
 
@@ -250,10 +248,12 @@ Since ActiveHashes usually are static, we can use shortcuts to assign via an eas
     end
 
     # config/initializers/data.rb
-    Country.data = [
-        {:id => 1, :name => "US"},
-        {:id => 2, :name => "Canada"}
-    ]
+    Rails.application.config.to_prepare do
+      Country.data = [
+          {:id => 1, :name => "US"},
+          {:id => 2, :name => "Canada"}
+      ]
+    end
 
     # Using `rails console`
     john = Person.new
@@ -334,6 +334,15 @@ Since ActiveYaml just creates a hash from the YAML file, you will have all field
       id: 3
       name: Mexico
 
+### Multiple files per model
+
+You can use multiple files to store your data. You will have to choose between hash or array style as you cannot use both for one model.
+
+    class Country < ActiveYaml::Base
+      use_mutliple_files
+      set_filenames "europe", "america", "asia", "africa"
+    end
+
 ### Using aliases in YAML
 
 Aliases can be used in ActiveYaml using either array or hash style by including `ActiveYaml::Aliases`.
@@ -373,6 +382,59 @@ With that module included, keys beginning with a '/' character can be safely add
     Soda.first.flavor # => sweet
     Soda.first.price # => 1.0
 
+## ActiveJSON
+
+If you want to store your data in JSON files, just inherit from ActiveJSON and specify your path information:
+
+    class Country < ActiveJSON::Base
+    end
+
+By default, this class will look for a json file named "countries.json" in the same directory as the file.  You can either change the directory it looks in, the filename it looks for, or both:
+
+    class Country < ActiveJSON::Base
+      set_root_path "/u/data"
+      set_filename "sample"
+    end
+
+The above example will look for the file "/u/data/sample.json".
+
+Since ActiveJSON just creates a hash from the JSON file, you will have all fields specified in JSON auto-defined for you.  You can format your JSON as an array, or as a hash:
+
+    # array style
+    [
+      {
+        "id": 1,
+        "name": "US",
+        "custom_field_1": "value1"
+      },
+      {
+        "id": 2,
+        "name": "Canada",
+        "custom_field_2": "value2"
+      }
+    ]
+
+    # hash style
+     {
+      { "us":
+        {
+          "id": 1,
+          "name": "US",
+          "custom_field_1": "value1"
+        }
+      },
+      { "canada":
+        {
+          "id": 2,
+          "name": "Canada",
+          "custom_field_2": "value2"
+        }
+      }
+    }
+
+### Multiple files per model
+
+  This works as it does for `ActiveYaml`
 
 ## ActiveFile
 
@@ -469,8 +531,7 @@ To make users' lives easier, please maintain support for:
 
 To that end, run specs against all rubies before committing:
 
-    rake appraisal:install
-    rake appraisal spec
+    wwtd
 
 Once appraisal passes in all supported rubies, follow these steps to release a new version of active_hash:
 

data/active_hash.gemspec

@@ -2,14 +2,10 @@
 
 $:.push File.expand_path("../lib", __FILE__)
 require "active_hash/version"
-require "util/ruby_engine"
-require "util/ruby_version"
 
 Gem::Specification.new do |s|
   s.name = %q{active_hash}
   s.version = ActiveHash::Gem::VERSION
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [
     "Jeff Dean",
     "Mike Dalessio",
@@ -30,14 +26,15 @@ Gem::Specification.new do |s|
     "Keenan Brock",
     "Desmond Bowe",
     "Matthew O'Riordan",
-    "Brett Richardson"
+    "Brett Richardson",
+    "Rachel Heaton",
   ]
-  s.date = %q{2012-01-18}
   s.email = %q{jeff@zilkey.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-    "README.md"
-  ]
+  s.summary = %q{An ActiveRecord-like model that uses a hash or file as a datasource}
+  s.description = %q{Includes the ability to specify data using hashes, yml files or JSON files}
+  s.homepage = %q{http://github.com/zilkey/active_hash}
+  s.license = "MIT"
+
   s.files = [
     "CHANGELOG",
     "LICENSE",
@@ -45,60 +42,8 @@ Gem::Specification.new do |s|
     "active_hash.gemspec",
     Dir.glob("lib/**/*")
   ].flatten
-  s.homepage = %q{http://github.com/zilkey/active_hash}
+  s.test_files = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{An ActiveRecord-like model that uses a hash or file as a datasource}
-  s.test_files = [
-    "Gemfile",
-    "spec/active_file/base_spec.rb",
-    "spec/active_hash/base_spec.rb",
-    "spec/active_yaml/base_spec.rb",
-    "spec/associations/associations_spec.rb",
-    "spec/enum/enum_spec.rb",
-    "spec/lint_spec.rb",
-    "spec/spec_helper.rb"
-  ]
-
-  supported_rails_versions = [">= 2.2.2"]
-
-  sqlite_gem = if RubyEngine.jruby?
-    if RubyVersion >= '1.9.3'
-      # Until 1.3.0 is released, we need to depend on a Beta version for JRuby and Rails 4
-      # https://github.com/jruby/activerecord-jdbc-adapter/issues/419#issuecomment-20567142
-      ['activerecord-jdbcsqlite3-adapter', ['>= 1.3.0.beta2']]
-    else
-      ['activerecord-jdbcsqlite3-adapter']
-    end
-  else
-    ['sqlite3']
-  end
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0')
-      s.add_runtime_dependency(%q<activesupport>, supported_rails_versions)
-      s.add_development_dependency(%q<rspec>, ["~> 2.2.0"])
-      s.add_development_dependency(*sqlite_gem)
-      s.add_development_dependency(%q<activerecord>, supported_rails_versions)
-      s.add_development_dependency(%q<wwtd>)
-      s.add_development_dependency(%q<rake>)
-    else
-      s.add_dependency(%q<activesupport>, supported_rails_versions)
-      s.add_dependency(%q<rspec>, ["~> 2.2.0"])
-      s.add_dependency(*sqlite_gem)
-      s.add_dependency(%q<activerecord>, supported_rails_versions)
-      s.add_dependency(%q<wwtd>)
-      s.add_dependency(%q<rake>)
-    end
-  else
-    s.add_dependency(%q<activesupport>, supported_rails_versions)
-    s.add_dependency(%q<rspec>, ["~> 2.2.0"])
-    s.add_dependency(*sqlite_gem)
-    s.add_dependency(%q<activerecord>, supported_rails_versions)
-    s.add_dependency(%q<wwtd>)
-    s.add_dependency(%q<rake>)
-  end
+  s.add_runtime_dependency('activesupport', '>= 2.2.2')
 end

data/lib/active_file/base.rb

@@ -1,6 +1,7 @@
 module ActiveFile
 
   class Base < ActiveHash::Base
+    extend ActiveFile::MultipleFiles
 
     if respond_to?(:class_attribute)
       class_attribute :filename, :root_path, :data_loaded
@@ -35,7 +36,6 @@ module ActiveFile
       end
 
       def full_path
-        actual_root_path = root_path  || Dir.pwd
         actual_filename  = filename   || name.tableize
         File.join(actual_root_path, "#{actual_filename}.#{extension}")
       end
@@ -45,6 +45,11 @@ module ActiveFile
       end
       protected :extension
 
+      def actual_root_path
+        root_path  || Dir.pwd
+      end
+      protected :actual_root_path
+
       [:find, :find_by_id, :all, :where, :method_missing].each do |method|
         define_method(method) do |*args|
           reload unless data_loaded

data/lib/active_file/hash_and_array_files.rb

@@ -0,0 +1,24 @@
+module ActiveFile
+  module HashAndArrayFiles
+    def raw_data
+      if multiple_files?
+        data_from_multiple_files
+      else
+        load_path(full_path)
+      end
+    end
+
+    private
+    def data_from_multiple_files
+      loaded_files = full_paths.collect { |path| load_path(path) }
+
+      if loaded_files.all?{ |file_data| file_data.is_a?(Array) }
+        loaded_files.sum
+      elsif loaded_files.all?{ |file_data| file_data.is_a?(Hash) }
+        loaded_files.inject({}) { |hash, file_data| hash.merge(file_data) }
+      else
+        raise ActiveHash::FileTypeMismatchError.new("Choose between hash or array syntax")
+      end
+    end
+  end
+end

data/lib/active_file/multiple_files.rb

@@ -0,0 +1,33 @@
+module ActiveFile
+  module MultipleFiles
+    def multiple_files?
+      false
+    end
+
+    def use_multiple_files
+      if respond_to?(:class_attribute)
+        class_attribute :filenames
+      else
+        class_inheritable_accessor :filenames
+      end
+
+      def self.set_filenames(*filenames)
+        self.filenames = filenames
+      end
+
+      def self.multiple_files?
+        true
+      end
+
+      def self.full_paths
+        if filenames.present?
+          filenames.collect do |filename|
+            File.join(actual_root_path, "#{filename}.#{extension}")
+          end
+        else
+          [full_path]
+        end
+      end
+    end
+  end
+end

data/lib/active_hash.rb

@@ -12,8 +12,11 @@ rescue LoadError
 end
 
 require 'active_hash/base'
+require 'active_file/multiple_files'
+require 'active_file/hash_and_array_files'
 require 'active_file/base'
 require 'active_yaml/base'
 require 'active_yaml/aliases'
+require 'active_json/base'
 require 'associations/associations'
 require 'enum/enum'

data/lib/active_hash/base.rb

@@ -9,6 +9,9 @@ module ActiveHash
   class IdError < StandardError
   end
 
+  class FileTypeMismatchError < StandardError
+  end
+
   class Base
 
     if respond_to?(:class_attribute)
@@ -28,6 +31,14 @@ module ActiveHash
 
     class << self
 
+      def cache_key
+        if Object.const_defined?(:ActiveModel)
+          model_name.cache_key
+        else
+          ActiveSupport::Inflector.tableize(self)
+        end
+      end
+
       def primary_key
         "id"
       end
@@ -111,7 +122,7 @@ module ActiveHash
       private :add_to_record_index
 
       def validate_unique_id(record)
-        raise IdError.new("Duplicate Id found for record #{record.attributes}") if record_index.has_key?(record.id.to_s)
+        raise IdError.new("Duplicate ID found for record #{record.attributes.inspect}") if record_index.has_key?(record.id.to_s)
       end
 
       private :validate_unique_id
@@ -154,7 +165,10 @@ module ActiveHash
         yield
       rescue LocalJumpError => err
         raise err
-      rescue ActiveRecord::Rollback
+      rescue StandardError => e
+        unless Object.const_defined?(:ActiveRecord) && e.is_a?(ActiveRecord::Rollback)
+          raise e
+        end
       end
 
       def delete_all
@@ -428,11 +442,11 @@ module ActiveHash
     def cache_key
       case
         when new_record?
-          "#{self.class.model_name.cache_key}/new"
+          "#{self.class.cache_key}/new"
         when timestamp = self[:updated_at]
-          "#{self.class.model_name.cache_key}/#{id}-#{timestamp.to_s(:number)}"
+          "#{self.class.cache_key}/#{id}-#{timestamp.to_s(:number)}"
         else
-          "#{self.class.model_name.cache_key}/#{id}"
+          "#{self.class.cache_key}/#{id}"
       end
     end
 

data/lib/active_hash/version.rb

@@ -1,5 +1,5 @@
 module ActiveHash
   module Gem
-    VERSION = "1.2.3"
+    VERSION = "1.3.0"
   end
 end

data/lib/active_json/base.rb

@@ -0,0 +1,25 @@
+module ActiveJSON
+  class Base < ActiveFile::Base
+    extend ActiveFile::HashAndArrayFiles
+    class << self
+      def load_file
+        if (data = raw_data).is_a?(Array)
+          data
+        else
+          data.values
+        end
+      end
+
+      def extension
+        "json"
+      end
+
+      private
+      def load_path(path)
+        JSON.load(File.open(path, 'r:bom|utf-8'))
+      end
+
+    end
+  end
+
+end