rails_agnostic_models 0.0.7 → 0.0.8

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZWI1MTNmNjU2ZDkzYjlmOThiNWZlZDcxYmFjNWJiODQyYTkyMWJiYQ==
+  data.tar.gz: !binary |-
+    MzRkZmQ0YTQ3MTNiNmQwNjAzOGY1YzE2ZjRmNWUzNWUxOTBmMWJlMg==
+SHA512:
+  metadata.gz: !binary |-
+    NjBlYmY2Njc0MDNlMjJlMzJmNjI1Y2VkMDdlYWRiM2NiNWJlNzM0NjQyMzM2
+    Y2FkZTljMGM5NWU2Y2ExNjk0ZDNlZWFjMDRhZGU1MzNmZGY1MGVmZmEwZTZm
+    OTI0OTFlYzVhMDY0ODkzNDU1NDk0ODhlYzBkM2E0NWQ2ODliMTI=
+  data.tar.gz: !binary |-
+    YTE0N2QwMTYxYjlmMjUwNzQyYWMxN2IzZTFmZjNiZTkyNTU2NmE1NjYzN2Jj
+    ZjliOWU4ZThjZjUyYTZhZmU4NjM2YzdlMzc0MzY0Y2UzOGQwMzFkMGExZjQ2
+    YTQ5YzU3ZTQ0YjIzYWM5OGYzYTBiYzI1YjcyMmNlYzFlOGU1Yzg=

data/lib/rails_agnostic_models/active_record_extensions.rb

@@ -1,52 +1,8 @@
+require_relative './rails_helpers'
 module RailsAgnosticModels
   module ActiveRecordExtensions
     module ClassMethods
       require 'ostruct'
-
-      # Checks if the host app is a Rails 2 app
-      def rails_2?
-        rails_loaded && (Rails::VERSION::MAJOR == 2)
-      end
-
-      # Checks if the host app is a Rails 3 app
-      def rails_3?
-        rails_loaded && (Rails::VERSION::MAJOR == 3)
-      end
-
-      # Checks if the host app is a Rails 4 app
-      def rails_4?
-        rails_loaded && (Rails::VERSION::MAJOR == 4)
-      end
-
-      # Checks if Rails is loaded
-      def rails_loaded
-        defined? Rails
-      end
-
-      # Takes a block that will only be executed in a Rails 2 Project
-      def rails_2(&block)
-        return nil unless rails_2?
-        yield
-      end
-
-      # Code to be executed insode of a Rails 3 app
-      def rails_3(&block)
-        return nil unless rails_3?
-        yield
-      end
-
-      # Code to be executed inside of a Rails 4 app
-      def rails_4(&block)
-        return nil unless rails_4?
-        yield
-      end
-
-      # Code to be executed only inside of a rails app 
-      def rails(&block)
-        return nil unless rails_loaded
-        yield
-      end
-
       # safely refer to constants that may not be defined. Useful in a gem that might get included in places that might not define EVERY active record model, such as
       # a satelite administration application. Note that you will still need to handle nil cases
       #
@@ -88,7 +44,7 @@ module RailsAgnosticModels
         if rails_2?
           default_scope options
         else
-          self.instance_eval "default_scope #{options_to_arel(options)}"
+          self.instance_eval "default_scope #{ArelTranslator::Translator.new(options).translate!}"
         end
       end
 
@@ -113,58 +69,10 @@ module RailsAgnosticModels
       def top_level_constant_lookup(constant)
         Object.const_get(constant) if Object.const_defined? constant
       end
-
-      def options_to_arel(options)
-        first_key = options.keys.first
-        option = OpenStruct.new
-        option.key = first_key
-        option.value = options[first_key]
-        code = "#{translate_arel(option)}"
-        options.keys.drop(1).each do |opt|
-          option.key = opt
-          option.value = options[opt]
-          code += ".#{translate_arel(option)}"
-        end
-        code
-      end
-
-      def translate_arel(option)
-        case option.key
-        when :order then "order('#{option.value}')"
-        when :conditions then "where(#{translate_where(option.value)})"
-        else ""
-        end
-      end
-
-      def translate_where(conditions)
-        case conditions
-        when Hash then return hash_without_braches(conditions)
-        when String then return "\"#{conditions}\""
-        when Array then return array_without_brackets(conditions)
-        end
-      end
-
-      def hash_without_braches(hash)
-        return hash.keys.inject([]) do |a, key|
-          a << "#{key}: #{hash[key]}"
-        end.join(', ')
-      end
-
-      def array_without_brackets(array)
-        return array.inject([]) do |a, value|
-          a << array_value(value)
-        end.join(", ")
-      end
-
-      def array_value(value)
-        case value
-        when String then return "\"#{value}\""
-        else return value
-        end
-      end
     end
     def self.included(klass)
       klass.extend(ClassMethods)
+      klass.extend(RailsAgnosticModels::RailsHelpers::ClassMethods)
     end
   end
   ActiveRecord::Base.send(:include, ActiveRecordExtensions)

data/lib/rails_agnostic_models/arel_translator/collection_converters.rb

@@ -0,0 +1,26 @@
+module RailsAgnosticModels
+  module ArelTranslator
+    module CollectionConverters
+      private
+      
+      def hash_without_braches(hash)
+        return hash.keys.inject([]) do |a, key|
+          a << "#{key}: #{hash[key]}"
+        end.join(', ')
+      end
+
+      def array_without_brackets(array)
+        return array.inject([]) do |a, value|
+          a << array_value(value)
+        end.join(", ")
+      end
+
+      def array_value(value)
+        case value
+        when String then return "\"#{value}\""
+        else return value
+        end
+      end
+    end
+  end
+end

data/lib/rails_agnostic_models/arel_translator/order.rb

@@ -0,0 +1,15 @@
+module RailsAgnosticModels
+  module ArelTranslator
+    class Order
+      attr_accessor :order
+
+      def initialize(order)
+        @order = order
+      end
+
+      def translate!
+        "order(\"#{self.order}\")"
+      end
+    end
+  end
+end

data/lib/rails_agnostic_models/arel_translator/translator.rb

@@ -0,0 +1,47 @@
+module RailsAgnosticModels
+  module ArelTranslator
+    class Translator
+      require 'ostruct'
+
+      attr_accessor :search_hash, :arel_string
+
+      def initialize(search_hash)
+        @search_hash = search_hash
+        @arel_string = ""
+      end
+
+      def translate!
+        options_to_arel(search_hash)
+        arel_string
+      end
+
+      private
+
+      def options_to_arel(options)
+        first_key = options.keys.first
+        option = hash_to_ostruct(first_key, options[first_key])
+        self.arel_string << "#{translate_arel(option)}"
+        options.keys.drop(1).each do |opt|
+          option = hash_to_ostruct(opt, options[opt])
+          self.arel_string << ".#{translate_arel(option)}"
+        end
+        self.arel_string
+      end
+
+      def hash_to_ostruct(key, value)
+        option = OpenStruct.new
+        option.key = key
+        option.value = value
+        option
+      end
+
+      def translate_arel(option)
+        case option.key
+        when :order then Order.new(option.value)
+        when :conditions then Where.new(option.value)
+        else ""
+        end.translate!
+      end
+    end
+  end
+end 

data/lib/rails_agnostic_models/arel_translator/where.rb

@@ -0,0 +1,26 @@
+module RailsAgnosticModels
+  module ArelTranslator
+    class Where
+      include CollectionConverters
+      attr_accessor :conditions
+
+      def initialize(conditions)
+        @conditions = conditions
+      end
+
+      def translate!
+        case self.conditions
+        when Hash then return wrap_where hash_without_braches(self.conditions)
+        when String then return wrap_where "\"#{self.conditions}\""
+        when Array then return wrap_where array_without_brackets(self.conditions)
+        end
+      end
+
+      private
+
+      def wrap_where(str)
+        "where(#{str})"
+      end
+    end
+  end
+end

data/lib/rails_agnostic_models/arel_translator.rb

@@ -0,0 +1,4 @@
+require 'rails_agnostic_models/arel_translator/collection_converters'
+require 'rails_agnostic_models/arel_translator/translator'
+require 'rails_agnostic_models/arel_translator/where'
+require 'rails_agnostic_models/arel_translator/order'

data/lib/rails_agnostic_models/rails_helpers.rb

@@ -0,0 +1,52 @@
+module RailsAgnosticModels
+  module RailsHelpers
+    module ClassMethods
+      # Checks if the host app is a Rails 2 app
+      def rails_2?
+        rails_loaded && (Rails::VERSION::MAJOR == 2)
+      end
+
+      # Checks if the host app is a Rails 3 app
+      def rails_3?
+        rails_loaded && (Rails::VERSION::MAJOR == 3)
+      end
+
+      # Checks if the host app is a Rails 4 app
+      def rails_4?
+        rails_loaded && (Rails::VERSION::MAJOR == 4)
+      end
+
+      # Checks if Rails is loaded
+      def rails_loaded
+        defined? Rails
+      end
+
+      # Takes a block that will only be executed in a Rails 2 Project
+      def rails_2(&block)
+        return nil unless rails_2?
+        yield
+      end
+
+      # Code to be executed insode of a Rails 3 app
+      def rails_3(&block)
+        return nil unless rails_3?
+        yield
+      end
+
+      # Code to be executed inside of a Rails 4 app
+      def rails_4(&block)
+        return nil unless rails_4?
+        yield
+      end
+
+      # Code to be executed only inside of a rails app 
+      def rails(&block)
+        return nil unless rails_loaded
+        yield
+      end
+    end
+    def self.included(klass)
+      klass.extend(ClassMethods)
+    end
+  end
+end

data/lib/rails_agnostic_models/version.rb

@@ -1,3 +1,3 @@
 module RailsAgnosticModels
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/lib/rails_agnostic_models.rb

@@ -1,3 +1,5 @@
 require "rails_agnostic_models/version"
 require "active_record"
+require 'rails_agnostic_models/rails_helpers'
+require "rails_agnostic_models/arel_translator"
 require "rails_agnostic_models/active_record_extensions"

data/spec/rails_agnostic_models/version_agnostic_default_scope_spec.rb

@@ -16,9 +16,9 @@ describe "#version_agnostic_default_scope" do
   end
   context "Rails 3" do
     before { stub_const("Rails::VERSION::MAJOR", 3) }
-    describe "order" do
+    describe "order", focus: true do
       let(:hash) { {order: "my_column desc"} }
-      let(:arel) { "default_scope order('#{hash[:order]}')" }
+      let(:arel) { "default_scope order(\"#{hash[:order]}\")" }
       it "converts options hash to arel calls" do
         Rails3Class.should_receive(:instance_eval).with(arel)
         Rails3Class.send(:version_agnostic_default_scope, hash)

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: rails_agnostic_models
 version: !ruby/object:Gem::Version
-  version: 0.0.7
-  prerelease: 
+  version: 0.0.8
 platform: ruby
 authors:
 - DVG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-12 00:00:00.000000000 Z
+date: 2014-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: debugger
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -139,6 +124,12 @@ files:
 - acts_as_taggable_on.sqlite3
 - lib/rails_agnostic_models.rb
 - lib/rails_agnostic_models/active_record_extensions.rb
+- lib/rails_agnostic_models/arel_translator.rb
+- lib/rails_agnostic_models/arel_translator/collection_converters.rb
+- lib/rails_agnostic_models/arel_translator/order.rb
+- lib/rails_agnostic_models/arel_translator/translator.rb
+- lib/rails_agnostic_models/arel_translator/where.rb
+- lib/rails_agnostic_models/rails_helpers.rb
 - lib/rails_agnostic_models/version.rb
 - rails_agnostic_models.gemspec
 - spec/rails_agnostic_models/safe_constant_spec.rb
@@ -149,33 +140,26 @@ files:
 homepage: ''
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1728372191715978669
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1728372191715978669
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Extends activerecord to provide rails-agnostic versions of common model code
   to east the pain of upgrading
 test_files: