active_hash 1.0.0 → 1.0.1

data/CHANGELOG

@@ -1,3 +1,7 @@
+2013-07-15 (v1.0.1)
+  - Travis CI for ActiveHash + Ruby 2, 1.8.7, Rubinius and JRuby support (mattheworiordan)
+  - no longer need to call .all before executing `find_by_*` or `where` methods (mattheworiordan)
+
 2013-06-24 (v1.0.0)
   - save is a no-op on existing records, instead of raising an error (issue #63)
 

data/README.md

@@ -1,5 +1,7 @@
 # ActiveHash
 
+[![Build Status](https://travis-ci.org/zilkey/active_hash.png?branch=master)](https://travis-ci.org/zilkey/active_hash)
+
 ActiveHash is a simple base class that allows you to use a ruby hash as a readonly datasource for an ActiveRecord-like model.
 
 ActiveHash assumes that every hash has an :id key, which is what you would probably store in a database.  This allows you to seemlessly upgrade from ActiveHash objects to full ActiveRecord objects without having to change any code in your app, or any foreign keys in your database.
@@ -15,9 +17,13 @@ ActiveHash also ships with:
 
 ## Installation
 
-Make sure gemcutter.org is one of your gem sources, then run:
+Bundler:
+
+    gem 'active_hash'
+
+Other:
 
-    sudo gem install active_hash
+  gem install active_hash
 
 ## Usage
 
@@ -294,7 +300,7 @@ By default, this class will look for a yml file named "countries.yml" in the sam
 
 The above example will look for the file "/u/data/sample.yml".
 
-Since ActiveYaml just creates a hash from the YAML file, you will have all fields specified in YAML auto-defined for you once you call all.  You can format your YAML as an array, or as a hash:
+Since ActiveYaml just creates a hash from the YAML file, you will have all fields specified in YAML auto-defined for you.  You can format your YAML as an array, or as a hash:
 
     # array style
     - id: 1

data/active_hash.gemspec

@@ -2,6 +2,8 @@
 
 $:.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}
@@ -58,28 +60,46 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb"
   ]
 
+  supported_rails_versions = if RubyVersion < '1.9.3'
+    [">= 2.2.2", "< 4"]
+  else
+    [">= 2.2.2"]
+  end
+
+  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') then
-      s.add_runtime_dependency(%q<activesupport>, [">= 2.2.2"])
+      s.add_runtime_dependency(%q<activesupport>, supported_rails_versions)
       s.add_development_dependency(%q<rspec>, ["~> 2.2.0"])
-      s.add_development_dependency(%q<sqlite3>, [">= 0"])
-      s.add_development_dependency(%q<activerecord>, [">= 2.2.2"])
-      s.add_development_dependency(%q<appraisal>, [">= 0"])
+      s.add_development_dependency(*sqlite_gem)
+      s.add_development_dependency(%q<activerecord>, supported_rails_versions)
+      s.add_development_dependency(%q<appraisal>)
     else
-      s.add_dependency(%q<activesupport>, [">= 2.2.2"])
+      s.add_dependency(%q<activesupport>, supported_rails_versions)
       s.add_dependency(%q<rspec>, ["~> 2.2.0"])
-      s.add_dependency(%q<sqlite3>, [">= 0"])
-      s.add_dependency(%q<activerecord>, [">= 2.2.2"])
-      s.add_dependency(%q<appraisal>, [">= 0"])
+      s.add_dependency(*sqlite_gem)
+      s.add_dependency(%q<activerecord>, supported_rails_versions)
+      s.add_dependency(%q<appraisal>)
     end
   else
-    s.add_dependency(%q<activesupport>, [">= 2.2.2"])
+    s.add_dependency(%q<activesupport>, supported_rails_versions)
     s.add_dependency(%q<rspec>, ["~> 2.2.0"])
-    s.add_dependency(%q<sqlite3>, [">= 0"])
-    s.add_dependency(%q<activerecord>, [">= 2.2.2"])
-    s.add_dependency(%q<appraisal>, [">= 0"])
+    s.add_dependency(*sqlite_gem)
+    s.add_dependency(%q<activerecord>, supported_rails_versions)
+    s.add_dependency(%q<appraisal>)
   end
 end

data/lib/active_file/base.rb

@@ -10,16 +10,6 @@ module ActiveFile
 
     class << self
 
-      def all(options={})
-        reload unless data_loaded
-        super
-      end
-
-      def where(options)
-        reload unless data_loaded
-        super
-      end
-
       def delete_all
         self.data_loaded = true
         super
@@ -53,19 +43,15 @@ module ActiveFile
       def extension
         raise "Override Me"
       end
+      protected :extension
 
-      def find(*args)
-        reload unless data_loaded
-        return super
-      end
-
-      def find_by_id(*args)
-        reload unless data_loaded
-        return super
+      [:find, :find_by_id, :all, :where, :method_missing].each do |method|
+        define_method(method) do |*args|
+          reload unless data_loaded
+          return super(*args)
+        end
       end
 
-      protected :extension
-
     end
   end
 

data/lib/active_hash/version.rb

@@ -1,5 +1,5 @@
 module ActiveHash
   module Gem
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
   end
 end

data/lib/active_yaml/aliases.rb

@@ -20,7 +20,7 @@ module ActiveYaml
     end
 
     def initialize(attributes={})
-      super unless attributes.keys.index { |k| k.match /^\//i }
+      super unless attributes.keys.index { |k| k.to_s.match /^\//i }
     end
   end
 

data/lib/util/ruby_engine.rb

@@ -0,0 +1,68 @@
+# 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

@@ -0,0 +1,139 @@
+# 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_hash/base_spec.rb

@@ -511,7 +511,7 @@ describe ActiveHash, "Base" do
         it "raises a NoMethodError" do
           lambda {
             Country.find_by_name_and_shoe_size("US", 10)
-          }.should raise_error(NoMethodError, "undefined method `find_by_name_and_shoe_size' for Country:Class")
+          }.should raise_error(NoMethodError, /undefined method `find_by_name_and_shoe_size' (?:for|on) Country/)
         end
       end
     end
@@ -540,7 +540,7 @@ describe ActiveHash, "Base" do
         it "raises a NoMethodError" do
           lambda {
             Country.find_by_name_and_shoe_size!("US", 10)
-          }.should raise_error(NoMethodError, "undefined method `find_by_name_and_shoe_size!' for Country:Class")
+          }.should raise_error(NoMethodError, /undefined method `find_by_name_and_shoe_size!' (?:for|on) Country/)
         end
       end
     end
@@ -567,7 +567,7 @@ describe ActiveHash, "Base" do
     it "doesn't blow up if you call a missing dynamic finder when fields haven't been set" do
       proc do
         Country.find_by_name("Foo")
-      end.should raise_error(NoMethodError, "undefined method `find_by_name' for Country:Class")
+      end.should raise_error(NoMethodError, /undefined method `find_by_name' (?:for|on) Country/)
     end
   end
 

data/spec/active_yaml/base_spec.rb

@@ -27,6 +27,15 @@ describe ActiveYaml::Base do
     end
   end
 
+  describe ".where" do
+    context "before the file is loaded" do
+      it "reads from the file and filters by where statement" do
+        State.where(:name => 'Oregon').should_not be_empty
+        State.count.should > 0
+      end
+    end
+  end
+
   describe ".delete_all" do
     context "when called before .all" do
       it "causes all to not load data" do
@@ -95,4 +104,16 @@ describe ActiveYaml::Base do
 
   end
 
+  describe 'meta programmed finders and properties for fields that exist in the YAML' do
+
+    it 'should have a finder method for each property' do
+      City.find_by_state('Oregon').should_not be_nil
+    end
+
+    it 'should have a find all method for each property' do
+      City.find_all_by_state('Oregon').should_not be_nil
+    end
+
+  end
+
 end

data/spec/associations/associations_spec.rb

@@ -7,7 +7,9 @@ describe ActiveHash::Base, "associations" do
     class Country < ActiveRecord::Base
       extend ActiveHash::Associations::ActiveRecordExtensions
       establish_connection :adapter => "sqlite3", :database => ":memory:"
-      connection.create_table(:countries, :force => true) {}
+      connection.create_table(:countries, :force => true) do |t|
+        t.string :name
+      end
     end
 
     class School < ActiveRecord::Base

data/spec/enum/enum_spec.rb

@@ -17,7 +17,7 @@ describe ActiveHash::Base, "enum" do
       enum_accessor :name, :county
 
       self.data = [
-        {name: "Queen Ann", county: "King"}
+        {:name => "Queen Ann", :county => "King"}
       ]
     end
   end

data/spec/spec_helper.rb

@@ -4,3 +4,5 @@ require 'rspec/autorun'
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'active_hash'
+
+require 'util/ruby_version.rb'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_hash
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -130,6 +130,8 @@ files:
 - 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
@@ -152,7 +154,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1921449152937241746
+      hash: 1166789792063015008
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: