active_hash 1.2.3 → 1.3.0

data/lib/active_yaml/base.rb

@@ -1,6 +1,7 @@
 module ActiveYaml
 
   class Base < ActiveFile::Base
+    extend ActiveFile::HashAndArrayFiles
     class << self
       def load_file
         if (data = raw_data).is_a?(Array)
@@ -10,15 +11,14 @@ module ActiveYaml
         end
       end
 
-      def raw_data
-        YAML.load_file(full_path)
-      end
-
       def extension
         "yml"
       end
 
+      private
+      def load_path(path)
+        YAML.load_file(path)
+      end
     end
   end
-
 end

data/lib/associations/associations.rb

@@ -8,8 +8,8 @@ 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
-        if klass < ActiveHash::Base
+        klass = options[:class_name].constantize rescue nil
+        if klass && klass < ActiveHash::Base
           belongs_to_active_hash(name, options)
         else
           super
@@ -82,7 +82,7 @@ module ActiveHash
           klass = options[:class_name].constantize
           primary_key_value = send(options[:primary_key])
 
-          if ActiveRecord.const_defined?(:Relation) && klass < ActiveRecord::Relation
+          if Object.const_defined?(:ActiveRecord) && ActiveRecord.const_defined?(:Relation) && klass < ActiveRecord::Relation
             klass.where(options[:foreign_key] => primary_key_value)
           elsif klass.respond_to?(:scoped)
             klass.scoped(:conditions => {options[:foreign_key] => primary_key_value})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_hash
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.3.0
 platform: ruby
 authors:
 - Jeff Dean
@@ -24,10 +24,11 @@ authors:
 - Desmond Bowe
 - Matthew O'Riordan
 - Brett Richardson
+- Rachel Heaton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-18 00:00:00.000000000 Z
+date: 2014-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -43,108 +44,31 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.2.2
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.2.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.2.0
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.2.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.2.2
-- !ruby/object:Gem::Dependency
-  name: wwtd
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: 
+description: Includes the ability to specify data using hashes, yml files or JSON
+  files
 email: jeff@zilkey.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- LICENSE
-- README.md
+extra_rdoc_files: []
 files:
 - CHANGELOG
 - LICENSE
 - README.md
 - active_hash.gemspec
 - lib/active_file/base.rb
+- lib/active_file/hash_and_array_files.rb
+- lib/active_file/multiple_files.rb
+- lib/active_hash.rb
 - lib/active_hash/base.rb
 - lib/active_hash/version.rb
-- lib/active_hash.rb
+- lib/active_json/base.rb
 - lib/active_yaml/aliases.rb
 - lib/active_yaml/base.rb
 - lib/associations/associations.rb
 - lib/enum/enum.rb
-- lib/util/ruby_engine.rb
-- lib/util/ruby_version.rb
-- 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
 homepage: http://github.com/zilkey/active_hash
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -162,16 +86,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 2.2.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: An ActiveRecord-like model that uses a hash or file as a datasource
-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
+test_files: []

data/Gemfile

@@ -1,3 +0,0 @@
-source "http://rubygems.org/"
-
-gemspec

data/lib/util/ruby_engine.rb

@@ -1,68 +0,0 @@
-# Sourced from http://rbjl.net/35-how-to-properly-check-for-your-ruby-interpreter-version-and-os
-# Extracted from http://rubyzucker.info/
-# Copyright (c) 2010-2013 Jan Lelis <http://happycode.org> released under the MIT license
-
-class RubyEngine
-  class << self
-    def interpreter
-      case
-      when RUBY_PLATFORM == 'parrot'
-        'cardinal'
-      when Object.constants.include?( :RUBY_ENGINE ) ||
-           Object.constants.include?( 'RUBY_ENGINE'  )
-        if RUBY_ENGINE == 'ruby'
-          if RUBY_DESCRIPTION =~ /Enterprise/
-            'ree'
-          else
-            'mri'
-          end
-        else
-          RUBY_ENGINE.to_s # jruby, rbx, ironruby, macruby, etc.
-        end
-      else # probably 1.8
-        'mri'
-      end
-    end
-
-    def is?(what)
-      what === interpreter
-    end
-    alias is is?
-
-    def to_s
-      interpreter
-    end
-
-    def mri?
-      RubyEngine.is? 'mri'
-    end
-    alias official_ruby? mri?
-    alias ruby? mri?
-
-    def jruby?
-      RubyEngine.is? 'jruby'
-    end
-    alias java? jruby?
-
-    def rubinius?
-      RubyEngine.is? 'rbx'
-    end
-    alias rbx? rubinius?
-
-    def ree?
-      RubyEngine.is? 'ree'
-    end
-    alias enterprise? ree?
-
-    def ironruby?
-      RubyEngine.is? 'ironruby'
-    end
-    alias iron_ruby? ironruby?
-
-    def cardinal?
-      RubyEngine.is? 'cardinal'
-    end
-    alias parrot? cardinal?
-    alias perl? cardinal?
-  end
-end

data/lib/util/ruby_version.rb

@@ -1,139 +0,0 @@
-# Sourced from http://rbjl.net/35-how-to-properly-check-for-your-ruby-interpreter-version-and-os
-# Extracted from http://rubyzucker.info/
-# Copyright (c) 2010-2013 Jan Lelis <http://happycode.org> released under the MIT license
-
-### usage examples
-# RubyVersion
-### check for the main version with a Float
-# RubyVersion.is? 1.8
-### use strings for exacter checking
-# RubyVersion.is.above '1.8.7'
-# RubyVersion.is.at_least '1.8.7' # or below, at_most, not
-### you can use the common comparison operators
-# RubyVersion >= '1.8.7'
-# RubyVersion.is.between? '1.8.6', '1.8.7'
-### relase date checks
-# RubyVersion.is.older_than Date.today
-# RubyVersion.is.newer_than '2009-08-19'
-### accessors
-# RubyVersion.major # e.g. => 1
-# RubyVersion.minor # e.g. => 8
-# RubyVersion.tiny  # e.g. => 7
-# RubyVersion.patchlevel # e.g. => 249
-# RubyVersion.description # e.g. => "ruby 1.8.7 (2010-01-10 patchlevel 249) [i486-linux]"
-
-require 'date'
-require 'time'
-
-module RubyVersion
-  class << self
-    def to_s
-      RUBY_VERSION
-    end
-
-    # comparable
-    def <=>(other)
-      value = case other
-        when Integer
-          RUBY_VERSION.to_i
-        when Float
-          RUBY_VERSION.to_f
-        when String
-          RUBY_VERSION
-        when Date,Time
-          other.class.parse(RUBY_RELEASE_DATE)
-        else
-          other = other.to_s
-          RUBY_VERSION
-        end
-      value <=> other
-    end
-    include Comparable
-
-    # chaining for dsl-like language
-    def is?(other = nil)
-      if other
-        RubyVersion == other
-      else
-        RubyVersion
-      end
-    end
-    alias is is?
-
-    # aliases
-    alias below     <
-    alias below?    <
-    alias at_most   <=
-    alias at_most?  <=
-    alias above     >
-    alias above?    >
-    alias at_least  >=
-    alias at_least? >=
-    alias exactly   ==
-    alias exactly?  ==
-    def not(other)
-      self != other
-    end
-    alias not?     not
-    alias between between?
-
-    # compare dates
-    def newer_than(other)
-      if other.is_a? Date or other.is_a? Time
-        RubyVersion > other
-      else
-        RUBY_RELEASE_DATE > other.to_s
-      end
-    end
-    alias newer_than? newer_than
-
-    def older_than(other)
-      if other.is_a? Date or other.is_a? Time
-        RubyVersion < other
-      else
-        RUBY_RELEASE_DATE < other.to_s
-      end
-    end
-    alias older_than? older_than
-
-    def released_today
-      RubyVersion.date == Date.today
-    end
-    alias released_today? released_today
-
-    # accessors
-
-    def major
-      RUBY_VERSION.to_i
-    end
-    alias main major
-
-    def minor
-      RUBY_VERSION.split('.')[1].to_i
-    end
-    alias mini minor
-
-    def tiny
-      RUBY_VERSION.split('.')[2].to_i
-    end
-
-    alias teeny tiny
-
-    def patchlevel
-      RUBY_PATCHLEVEL
-    end
-
-    def platform
-      RUBY_PLATFORM
-    end
-
-    def release_date
-      Date.parse RUBY_RELEASE_DATE
-    end
-    alias date release_date
-
-    def description
-      RUBY_DESCRIPTION
-    end
-  end
-end

data/spec/active_file/base_spec.rb

@@ -1,131 +0,0 @@
-require 'spec_helper'
-
-describe ActiveFile::Base do
-  before do
-    class Country < ActiveFile::Base
-    end
-  end
-
-  after do
-    Object.send :remove_const, :Country
-  end
-
-  describe ".filename=" do
-    before do
-      Country.filename = "foo-izzle"
-
-      class Bar < ActiveFile::Base
-        self.filename = "bar-izzle"
-      end
-    end
-
-    it "sets the filename on a per-subclass basis" do
-      Country.filename.should == "foo-izzle"
-      Bar.filename.should == "bar-izzle"
-    end
-  end
-
-  describe ".set_filename" do
-    before do
-      Country.set_filename "foo-izzle"
-
-      class Bar < ActiveFile::Base
-        set_filename "bar-izzle"
-      end
-    end
-
-    it "sets the filename on a per-subclass basis" do
-      Country.filename.should == "foo-izzle"
-      Bar.filename.should == "bar-izzle"
-    end
-  end
-
-  describe ".root_path=" do
-    before do
-      Country.root_path = "foo-izzle"
-
-      class Bar < ActiveFile::Base
-        self.root_path = "bar-izzle"
-      end
-    end
-
-    it "sets the root_path on a per-subclass basis" do
-      Country.root_path.should == "foo-izzle"
-      Bar.root_path.should == "bar-izzle"
-    end
-  end
-
-  describe ".set_root_path" do
-    before do
-      Country.set_root_path "foo-izzle"
-
-      class Bar < ActiveFile::Base
-        set_root_path "bar-izzle"
-      end
-    end
-
-    it "sets the root_path on a per-subclass basis" do
-      Country.root_path.should == "foo-izzle"
-      Bar.root_path.should == "bar-izzle"
-    end
-  end
-
-  describe ".full_path" do
-    it "defaults to the directory of the calling file" do
-      class Country
-        def self.extension() "foo" end
-      end
-
-      Country.full_path.should == "#{Dir.pwd}/countries.foo"
-    end
-  end
-
-  describe ".reload" do
-    before do
-      class Country
-        def self.load_file()
-          {"new_york"=>{"name"=>"New York", "id"=>1}}.values
-        end
-      end
-      Country.reload # initial load
-    end
-
-    context "when nothing has been modified" do
-      it "does not reload anything" do
-        class Country
-          def self.load_file()
-            raise "should not have been called"
-          end
-        end
-        Country.dirty.should be_false
-        Country.reload
-        Country.dirty.should be_false
-      end
-    end
-
-    context "when forced" do
-      it "reloads the data" do
-        class Country
-          def self.load_file()
-            {"new_york"=>{"name"=>"New York", "id"=>2}}.values
-          end
-        end
-        Country.dirty.should be_false
-        Country.find_by_id(2).should be_nil
-        Country.reload(true)
-        Country.dirty.should be_false
-        Country.find(2).name.should == "New York"
-      end
-    end
-
-    context "when the data has been modified" do
-      it "reloads the data" do
-        Country.create!
-        Country.dirty.should be_true
-        Country.reload
-        Country.dirty.should be_false
-      end
-    end
-  end
-
-end