active_hash 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 652802c90d3e70506b8997f124021284e8b073be
-  data.tar.gz: a4b876f9bc3c7316c6d12f3945e2b74b20b8a11f
+  metadata.gz: b8402bf0998ccf7ae1e02e14a7f8d751d223fb2f
+  data.tar.gz: cebb5ad579c8330dd32de73c0c3e30b2ab9bb7a5
 SHA512:
-  metadata.gz: 53e0ad1f1e45a7adb6cd51ea367102ec959a21c19245d52ec9534c6976754fdf888efe3da463818ff1c14c9c0048fa2c0e51a9b4164857ee811076eb6af11612
-  data.tar.gz: cb66a911b00f3b9b4c25de6485fc0e7b9fff3b66efeabd5e70a5dcf52134afba7d990951cc232beaec45dc4ed12b1760c3fe79e1a818b7d317bd8f6a15692d67
+  metadata.gz: d4d6a5528d93310bb3d84ba38e92074df4a9717fd22b36ccf6133b6bd038ccd8a47b111d5e6c89255c64bbfb6cc86e000fc184a9d92880a41621a44ccb5d4218
+  data.tar.gz: 294a765759e4310f83de96efcc43d670c099196e070a470483fd1123b9b52bca01fbf76b87a9a93fec746993e0470a4c00c54950f48d1576e68b735dc734b8f8

data/CHANGELOG

@@ -1,3 +1,6 @@
+2017-03-24 (v1.5.0)
+  - add support for `.find_by!`(@syguer)
+
 2015-09-13 (v1.4.1)
   - fix bug where `#attributes` didn't contain default values #107
   - add support for `.find_by` and `#_read_attribute`. Thanks, @andrewfader!

data/README.md

@@ -141,15 +141,17 @@ If you prefer to store your data in YAML, see below.
 
 ActiveHash gives you ActiveRecord-esque methods like:
 ```ruby
-Country.all             # => returns all Country objects
-Country.count           # => returns the length of the .data array
-Country.first           # => returns the first country object
-Country.last            # => returns the last country object
-Country.find 1          # => returns the first country object with that id
-Country.find [1,2]      # => returns all Country objects with ids in the array
-Country.find :all       # => same as .all
-Country.find :all, args # => the second argument is totally ignored, but allows it to play nicely with AR
-Country.find_by_id 1    # => find the first object that matches the id
+Country.all                  # => returns all Country objects
+Country.count                # => returns the length of the .data array
+Country.first                # => returns the first country object
+Country.last                 # => returns the last country object
+Country.find 1               # => returns the first country object with that id
+Country.find [1,2]           # => returns all Country objects with ids in the array
+Country.find :all            # => same as .all
+Country.find :all, args      # => the second argument is totally ignored, but allows it to play nicely with AR
+Country.find_by_id 1         # => find the first object that matches the id
+Country.find_by(name: 'US')  # => returns the first country object with specified argument
+Country.find_by!(name: 'US') # => same as find_by, but raise exception when not found
 ```
 It also gives you a few dynamic finder methods.  For example, if you defined :name as a field, you'd get:
 ```ruby
@@ -217,7 +219,7 @@ class Person < ActiveRecord::Base
   belongs_to :country
 end
 ```
-However, as of ActiveRecord 3.1 support for ActiveRecord's `belong_to` is broken.  Instead, you must extend ActiveHash::Associations::ActiveRecordExtensions method:
+However, as of ActiveRecord 3.1 support for ActiveRecord's `belongs_to` is broken.  Instead, you must extend ActiveHash::Associations::ActiveRecordExtensions method:
 ```ruby
 class Country < ActiveHash::Base
 end
@@ -489,6 +491,20 @@ In Rails, in development mode, it reloads the entire class, which reloads the fi
 
 NOTE:  By default, .full_path refers to the current working directory.  In a rails app, this will be RAILS_ROOT.
 
+
+## Reloading ActiveYaml, ActiveJSON and ActiveFile
+
+During the development you may often change your data and want to see your changes immediately.
+Call `Model.reload(true)` to force reload the data from disk.
+
+In Rails, you can use this snippet. Please just note it resets the state every request, which may not always be desired.
+
+```ruby
+before_filter do
+  [Model1, Model2, Model3].each { |m| m.reload(true) }
+end
+```
+
 ## Enum
 
 ActiveHash can expose its data in an Enumeration by setting constants for each record. This allows records to be accessed in code through a constant set in the ActiveHash class.

data/active_hash.gemspec

@@ -4,7 +4,7 @@ $:.push File.expand_path("../lib", __FILE__)
 require "active_hash/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{active_hash}
+  s.name = "active_hash"
   s.version = ActiveHash::Gem::VERSION
   s.authors = [
     "Jeff Dean",
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
     "Matthew O'Riordan",
     "Brett Richardson",
     "Rachel Heaton",
+    "Keisuke Izumiya"
   ]
   s.email = %q{jeff@zilkey.com}
   s.summary = %q{An ActiveRecord-like model that uses a hash or file as a datasource}
@@ -43,7 +44,6 @@ Gem::Specification.new do |s|
     Dir.glob("lib/**/*")
   ].flatten
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
-  s.require_paths = ["lib"]
-
   s.add_runtime_dependency('activesupport', '>= 2.2.2')
+  s.required_ruby_version = '>= 1.9.3'
 end

data/lib/active_hash/base.rb

@@ -150,14 +150,21 @@ module ActiveHash
         if options.has_key?(:conditions)
           where(options[:conditions])
         else
-          @records || []
+          @records ||= []
         end
       end
 
       def where(options)
-        return @records if options.nil?
-        (@records || []).select do |record|
-          options.all? { |col, match| record[col] == match }
+        return @records if options.blank?
+
+        # use index if searching by id
+        if (ids = (options.delete(:id) || options.delete("id")))
+          candidates = Array.wrap(ids).map { |id| find_by_id(id) }
+        end
+        return candidates if options.blank?
+
+        (candidates || @records || []).select do |record|
+          match_options?(record, options)
         end
       end
 
@@ -165,6 +172,22 @@ module ActiveHash
         where(options).first
       end
 
+      def find_by!(options)
+        find_by(options) || (raise RecordNotFound.new("Couldn't find #{name}"))
+      end
+
+      def match_options?(record, options)
+        options.all? do |col, match|
+          if match.kind_of?(Array)
+            match.include?(record[col])
+          else
+            record[col] == match
+          end
+        end
+      end
+
+      private :match_options?
+
       def count
         all.length
       end
@@ -191,6 +214,8 @@ module ActiveHash
             nil
           when :all
             all
+          when :first
+            all(*args).first
           when Array
             id.map { |i| find(i) }
           else
@@ -281,7 +306,7 @@ module ActiveHash
       end
 
       def define_getter_method(field, default_value)
-        unless has_instance_method?(field)
+        unless instance_methods.include?(field.to_sym)
           define_method(field) do
             attributes[field].nil? ? default_value : attributes[field]
           end
@@ -291,8 +316,8 @@ module ActiveHash
       private :define_getter_method
 
       def define_setter_method(field)
-        method_name = "#{field}="
-        unless has_instance_method?(method_name)
+        method_name = :"#{field}="
+        unless instance_methods.include?(method_name)
           define_method(method_name) do |new_val|
             attributes[field] = new_val
           end
@@ -303,7 +328,7 @@ module ActiveHash
 
       def define_interrogator_method(field)
         method_name = :"#{field}?"
-        unless has_instance_method?(method_name)
+        unless instance_methods.include?(method_name)
           define_method(method_name) do
             send(field).present?
           end
@@ -314,10 +339,10 @@ module ActiveHash
 
       def define_custom_find_method(field_name)
         method_name = :"find_by_#{field_name}"
-        unless has_singleton_method?(method_name)
+        unless singleton_methods.include?(method_name)
           the_meta_class.instance_eval do
             define_method(method_name) do |*args|
-              options = args.extract_options!
+              args.extract_options!
               identifier = args[0]
               all.detect { |record| record.send(field_name) == identifier }
             end
@@ -329,11 +354,11 @@ module ActiveHash
 
       def define_custom_find_all_method(field_name)
         method_name = :"find_all_by_#{field_name}"
-        unless has_singleton_method?(method_name)
+        unless singleton_methods.include?(method_name)
           the_meta_class.instance_eval do
             unless singleton_methods.include?(method_name)
               define_method(method_name) do |*args|
-                options = args.extract_options!
+                args.extract_options!
                 identifier = args[0]
                 all.select { |record| record.send(field_name) == identifier }
               end
@@ -385,18 +410,6 @@ module ActiveHash
 
       private :mark_clean
 
-      def has_instance_method?(name)
-        instance_methods.map { |method| method.to_sym }.include?(name)
-      end
-
-      private :has_instance_method?
-
-      def has_singleton_method?(name)
-        singleton_methods.map { |method| method.to_sym }.include?(name)
-      end
-
-      private :has_singleton_method?
-
     end
 
     def initialize(attributes = {})
@@ -405,6 +418,7 @@ module ActiveHash
       attributes.dup.each do |key, value|
         send "#{key}=", value
       end
+      yield self if block_given?
     end
 
     def attributes
@@ -422,6 +436,7 @@ module ActiveHash
     def _read_attribute(key)
       attributes[key]
     end
+    alias_method :read_attribute, :_read_attribute
 
     def []=(key, val)
       attributes[key] = val

data/lib/active_hash/version.rb

@@ -1,5 +1,5 @@
 module ActiveHash
   module Gem
-    VERSION = "1.4.1"
+    VERSION = "1.5.0"
   end
 end

data/lib/active_yaml/aliases.rb

@@ -12,15 +12,15 @@ module ActiveYaml
       end
 
       def raw_data
-        YAML.load_file(full_path).reject do |k, v|
-          v.kind_of? Hash and k.match /^\//i
+        super.reject do |k, v|
+          v.kind_of? Hash and k.match(/^\//i)
         end
       end
 
     end
 
     def initialize(attributes={})
-      super unless attributes.keys.index { |k| k.to_s.match /^\//i }
+      super unless attributes.keys.index { |k| k.to_s.match(/^\//i) }
     end
   end
 

data/lib/associations/associations.rb

@@ -8,7 +8,14 @@ module ActiveHash
         options = our_args.extract_options!
         name = our_args.shift
         options = {:class_name => name.to_s.camelize }.merge(options)
-        klass = options[:class_name].constantize rescue nil
+        klass =
+          begin
+            options[:class_name].constantize
+          rescue
+            nil
+          rescue LoadError
+            nil
+          end
         if klass && klass < ActiveHash::Base
           belongs_to_active_hash(name, options)
         else

data/lib/enum/enum.rb

@@ -16,7 +16,7 @@ module ActiveHash
 
       def insert(record)
         super
-        set_constant(record) if @enum_accessors.present?
+        set_constant(record) if defined?(@enum_accessors)
       end
 
       def delete_all

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_hash
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Jeff Dean
@@ -25,10 +25,11 @@ authors:
 - Matthew O'Riordan
 - Brett Richardson
 - Rachel Heaton
+- Keisuke Izumiya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-13 00:00:00.000000000 Z
+date: 2017-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -78,7 +79,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -86,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: An ActiveRecord-like model that uses a hash or file as a datasource