forest_liana 1.0.0.pre.beta.3 → 1.0.0.pre.beta.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c441f632d727c3c652579b7046bb0f61b26ac11b
-  data.tar.gz: 7954a066e87c9436bdb25ffea3a2fddb1defed3b
+  metadata.gz: 1440f829c84d9e72e9cd2d28414d644ea9000296
+  data.tar.gz: 29c6a921350fe9a254c2722493e28381e4351887
 SHA512:
-  metadata.gz: feb8c12be5289fbf48d9f126cab69d32f605568d0442b5aa19cd95a209119ec88396aa0e5c648c2010057a1d3a2f24e42dc29c47236102e85abd102567481f1a
-  data.tar.gz: 2147c19557e09e9ae30f0f33f7582109bc9b89fd075c63845f5d24c06a1ab0a2a025850433ab71b0b3149a96874509f731717fdde84f7a95009911d95db32d17
+  metadata.gz: ed6c960a600df1b8e890367d3b5b18411ba81a51ec994cf1cdb41270615d94d7cdbfbf90de301eeb9e316f17de57461c8a8f41e52e0bbab983c2d67478a7b228
+  data.tar.gz: 6644dac11fc2a615ab9c85c19a85c44ecf89e7a254e076f2b45e8a51a1bbcb380d0e888b09a5b63e166269a897e09f53559f15773b8f34e045f8b187a3adae60

data/app/controllers/forest_liana/application_controller.rb

@@ -22,7 +22,7 @@ module ForestLiana
     end
 
     def authenticate_user_from_jwt
-      JWT.decode request.headers[:Authorization].split[1],
+      JWT.decode request.headers['Authorization'].split[1],
         ForestLiana.jwt_signing_key
     end
 

data/app/services/forest_liana/resources_getter.rb

@@ -21,7 +21,7 @@ module ForestLiana
     private
 
     def search_query
-      SearchQueryBuilder.new(@resource.joins(includes), @params).perform
+      SearchQueryBuilder.new(@resource.includes(includes), @params).perform
     end
 
     def sort_query
@@ -68,10 +68,8 @@ module ForestLiana
     end
 
     def includes
-      # avoid .joins on polymorphic associations
       @resource
         .reflect_on_all_associations
-        .select {|a| a.options[:polymorphic].blank?}
         .map {|a| a.name }
     end
 

data/app/services/forest_liana/search_query_builder.rb

@@ -20,15 +20,14 @@ module ForestLiana
 
         @resource.columns.each_with_index do |column, index|
           if column.name == 'id'
-            conditions << @resource.where(id: @params[:search])
+            conditions << "id = #{@params[:search].to_i}"
           elsif column.type == :string || column.type == :text
-            conditions << @resource.where(
-              @resource.arel_table[column.name].matches(
-                "%#{@params[:search].downcase}%"))
+            conditions <<
+              "#{column.name} LIKE '%#{@params[:search].downcase}%'"
           end
         end
 
-        @resource = @resource.where.or(*conditions)
+        @resource = @resource.where(conditions.join(' OR '))
       end
     end
 

data/config/initializers/rails32_http_patch_support_initializer.rb

@@ -0,0 +1 @@
+require_dependency ForestLiana::Engine.root.join("lib/patches/add_patch_method").to_s

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "1.0.0-beta.3"
+  VERSION = "1.0.0-beta.4"
 end

data/lib/patches/add_patch_method.rb

@@ -0,0 +1,124 @@
+# Rails 3.2 support for HTTP PATCH.
+if Rails::VERSION::MAJOR < 4
+# see http://weblog.rubyonrails.org/2012/2/26/edge-rails-patch-is-the-new-primary-http-method-for-updates/
+# https://github.com/rails/rails/pull/505
+
+ActionDispatch::Routing::Mapper::HttpHelpers.module_eval do
+  # Define a route that only recognizes HTTP PATCH.
+  # For supported arguments, see <tt>Base#match</tt>.
+  #
+  # Example:
+  #
+  # patch 'bacon', :to => 'food#bacon'
+  def patch(*args, &block)
+    map_method(:patch, *args, &block)
+  end
+
+  def put(*args, &block)
+    map_method(:put, *args, &block)
+    map_method(:patch, *args, &block)
+  end
+end
+
+# Be very conservative not to monkey-patch any methods until
+# the relevant files are loaded.
+ActiveSupport.on_load(:action_controller) do
+  ActionDispatch::Request.module_eval do
+    # Is this a PATCH request?
+    # Equivalent to <tt>request.request_method == :patch</tt>.
+    def patch?
+      HTTP_METHOD_LOOKUP[request_method] == :patch
+    end
+  end
+  module ActionDispatch::Routing
+    HTTP_METHODS << :patch unless HTTP_METHODS.include?(:patch)
+  end
+  ActionDispatch::Integration::RequestHelpers.module_eval do
+    # Performs a PATCH request with the given parameters. See +#get+ for more
+    # details.
+    def patch(path, parameters = nil, headers = nil)
+      process :patch, path, parameters, headers
+    end
+
+    # Performs a PATCH request, following any subsequent redirect.
+    # See +request_via_redirect+ for more information.
+    def patch_via_redirect(path, parameters = nil, headers = nil)
+      request_via_redirect(:patch, path, parameters, headers)
+    end
+  end
+  ActionDispatch::Integration::Runner.class_eval do
+    %w(patch).each do |method|
+      define_method(method) do |*args|
+        reset! unless integration_session
+        # reset the html_document variable, but only for new get/post calls
+        @html_document = nil unless method.in?(["cookies", "assigns"])
+        integration_session.__send__(method, *args).tap do
+          copy_session_variables!
+        end
+      end
+    end
+  end
+  module ActionController::TestCase::Behavior
+    def patch(action, parameters = nil, session = nil, flash = nil)
+      process(action, parameters, session, flash, "PATCH")
+    end
+  end
+  class ActionController::Responder
+    ACTIONS_FOR_VERBS.update(:patch => :edit)
+    delegate :patch?, :to => :request
+  end
+  ActionView::Helpers::FormHelper.module_eval do
+    # = Action View Form Helpers
+    def apply_form_for_options!(record, object, options) #:nodoc:
+      object = convert_to_model(object)
+
+      as = options[:as]
+      action, method = object.respond_to?(:persisted?) && object.persisted? ? [:edit, :patch] : [:new, :post]
+      options[:html].reverse_merge!(
+        :class  => as ? "#{action}_#{as}" : dom_class(object, action),
+        :id     => as ? "#{action}_#{as}" : [options[:namespace], dom_id(object, action)].compact.join("_").presence,
+        :method => method
+      )
+
+      options[:url] ||= polymorphic_path(record, :format => options.delete(:format))
+    end
+    private :apply_form_for_options!
+  end
+  module ActionDispatch::Routing::Mapper::Resources
+    class SingletonResource
+      def resource(*resources, &block)
+        options = resources.extract_options!.dup
+
+        if apply_common_behavior_for(:resource, resources, options, &block)
+          return self
+        end
+
+        resource_scope(:resource, SingletonResource.new(resources.pop, options)) do
+          yield if block_given?
+
+          collection do
+            post :create
+          end if parent_resource.actions.include?(:create)
+
+          new do
+            get :new
+          end if parent_resource.actions.include?(:new)
+
+          member do
+            get    :edit if parent_resource.actions.include?(:edit)
+            get    :show if parent_resource.actions.include?(:show)
+            if parent_resource.actions.include?(:update)
+               # all that for this PATCH
+               patch  :update
+               put    :update
+            end
+            delete :destroy if parent_resource.actions.include?(:destroy)
+          end
+        end
+
+        self
+      end
+    end
+  end
+end
+end

metadata

@@ -1,71 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.beta.3
+  version: 1.0.0.pre.beta.4
 platform: ruby
 authors:
 - Sandro Munda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-03 00:00:00.000000000 Z
+date: 2015-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: jsonapi-serializers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.6
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.6
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-cors
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0'
 description: Forest Rails Liana
 email:
 - sandro@munda.me
@@ -92,13 +92,14 @@ files:
 - app/services/forest_liana/schema_adapter.rb
 - app/services/forest_liana/search_query_builder.rb
 - app/views/layouts/forest_liana/application.html.erb
-- config/initializers/active_record_or.rb
 - config/initializers/mimetype.rb
+- config/initializers/rails32_http_patch_support_initializer.rb
 - config/routes.rb
 - lib/forest_liana.rb
 - lib/forest_liana/engine.rb
 - lib/forest_liana/version.rb
 - lib/generators/forest_liana/install_generator.rb
+- lib/patches/add_patch_method.rb
 - lib/tasks/forest_tasks.rake
 - test/dummy/README.rdoc
 - test/dummy/Rakefile

data/config/initializers/active_record_or.rb

@@ -1,21 +0,0 @@
-ActiveRecord::QueryMethods::WhereChain.class_eval do
-  def or(*scopes)
-    scopes_where_values = []
-    scopes_bind_values  = []
-    scopes.each do |scope|
-      case scope
-      when ActiveRecord::Relation
-        scopes_where_values += scope.where_values
-        scopes_bind_values += scope.bind_values
-      when Hash
-        temp_scope = @scope.model.where(scope)
-        scopes_where_values += temp_scope.where_values
-        scopes_bind_values  += temp_scope.bind_values
-      end
-    end
-    scopes_where_values = scopes_where_values.inject(:or)
-    @scope.where_values += [scopes_where_values]
-    @scope.bind_values  += scopes_bind_values
-    @scope
-  end
-end