gatherable 1.2.0 → 2.0.0

data/spec/lib/gatherable_spec.rb

@@ -6,7 +6,7 @@ describe Gatherable do
     context 'data tables' do
       context 'saving data tables' do
         it 'saves data tables' do
-          expect(Gatherable.config.data_tables.count).to eql 2
+          expect(Gatherable.config.data_tables.count).to eql DataTable.all.keys.count
         end
 
         it 'saves data tables as data with correct name' do
@@ -67,12 +67,6 @@ describe Gatherable do
     context 'routes' do
       let(:routes) { Gatherable::Engine.routes.routes }
 
-      it 'prefixes route with global identifier' do
-        routes.each do |r|
-          expect(r.path.spec.to_s).to match(/^\/:session_id\//)
-        end
-      end
-
       Gatherable.config.data_tables.map(&:name).map(&:to_s).each do |name|
         it "creates a named path for #{name}" do
           expect(routes.map(&:name)).to include name
@@ -83,12 +77,13 @@ describe Gatherable do
         end
 
         context 'generating routes' do
-          let(:create_route) { routes.find{ |r| r.verb == /^POST$/ && r.path.spec.to_s == "/:session_id/#{name.pluralize}(.:format)" } }
-          let(:show_route) { routes.find{ |r| r.verb == /^GET$/ && r.path.spec.to_s == "/:session_id/#{name.pluralize}/:#{name}_id(.:format)" } }
-          let(:index_route) { routes.find{ |r| r.verb == /^GET$/ && r.path.spec.to_s == "/:session_id/#{name.pluralize}(.:format)" } }
-          let(:update_route) { routes.find{ |r| r.verb == /^PUT$/ && r.path.spec.to_s == "/:session_id/#{name.pluralize}/:#{name}_id(.:format)" } }
-          let(:patch_route) { routes.find{ |r| r.verb == /^PATCH$/ && r.path.spec.to_s == "/:session_id/#{name.pluralize}/:#{name}_id(.:format)" } }
-          let(:delete_route) { routes.find{ |r| r.verb == /^DELETE$/ && r.path.spec.to_s == "/:session_id/#{name.pluralize}/:#{name}_id(.:format)" } }
+          let(:route_prefix) { Gatherable.config.prefixed_resources.include?(name.to_sym) ? ':session_id/' : '' }
+          let(:create_route) { routes.find{ |r| r.verb == /^POST$/ && r.path.spec.to_s == "/#{route_prefix}#{name.pluralize}(.:format)" } }
+          let(:show_route) { routes.find{ |r| r.verb == /^GET$/ && r.path.spec.to_s == "/#{route_prefix}#{name.pluralize}/:#{name}_id(.:format)" } }
+          let(:index_route) { routes.find{ |r| r.verb == /^GET$/ && r.path.spec.to_s == "/#{route_prefix}#{name.pluralize}(.:format)" } }
+          let(:update_route) { routes.find{ |r| r.verb == /^PUT$/ && r.path.spec.to_s == "/#{route_prefix}#{name.pluralize}/:#{name}_id(.:format)" } }
+          let(:patch_route) { routes.find{ |r| r.verb == /^PATCH$/ && r.path.spec.to_s == "/#{route_prefix}#{name.pluralize}/:#{name}_id(.:format)" } }
+          let(:delete_route) { routes.find{ |r| r.verb == /^DELETE$/ && r.path.spec.to_s == "/#{route_prefix}#{name.pluralize}/:#{name}_id(.:format)" } }
 
           specify 'for create' do
             expect(create_route).to_not be_nil

data/spec/lib/generators/gatherable_generator_spec.rb

@@ -10,7 +10,8 @@ describe GatherableGenerator, :type => :generator do
   it 'creates initializer' do
     generator = described_class.new(['initializer'])
     allow(described_class).to receive(:new) { generator }
-    expect(generator).to receive(:copy_file).with('gatherable.rb', 'config/initializers/gatherable.rb')
+    expect(generator).to receive(:copy_file).with('lib/generators/gatherable/templates/gatherable.rb',
+                                                  'config/initializers/gatherable.rb')
     Rails::Generators.invoke('gatherable', ['initializer'])
   end
 
@@ -85,7 +86,8 @@ end
     context 'setup' do
       it 'copies application controller' do
         allow(Gatherable.config).to receive(:data_tables) { [] }
-        expect(generator).to receive(:copy_file).with('application_controller.rb', 'app/controllers/gatherable/application_controller.rb')
+        expect(generator).to receive(:copy_file).with('app/controllers/gatherable/application_controller.rb',
+                                                      'app/controllers/gatherable/application_controller.rb')
         Rails::Generators.invoke('gatherable', ['controllers'])
       end
     end
@@ -127,7 +129,7 @@ var Price = {
     });
   }
 }
-        content
+      content
     end
     let(:generator_target) { 'javascripts' }
     it_behaves_like 'creating a file'

data/spec/support/test_config.rb

@@ -1,12 +1,4 @@
 Gatherable.configure do |c|
   c.global_identifier = :session_id
-
   c.data_point :price, :decimal, allowed_controller_actions: %w[index show create update destroy]
-
-  c.data_table(
-    :requested_loan_amount,
-    { requested_loan_amount: :decimal, total_cost: :decimal, monthly_repayment_amount: :decimal },
-    new_record_strategy: :update,
-    allowed_controller_actions: %w[index show create update destroy]
-  )
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gatherable
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Daniel Schepers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-11 00:00:00.000000000 Z
+date: 2016-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -117,7 +117,6 @@ files:
 - lib/gatherable/version.rb
 - lib/generators/gatherable/USAGE
 - lib/generators/gatherable/gatherable_generator.rb
-- lib/generators/gatherable/templates/application_controller.rb
 - lib/generators/gatherable/templates/gatherable.rb
 - lib/tasks/db_tasks.rake
 - lib/tasks/gatherable_tasks.rake

data/lib/generators/gatherable/templates/application_controller.rb

@@ -1,88 +0,0 @@
-module Gatherable
-  class ApplicationController < ::ActionController::Base
-    before_action :authenticate, only: [:create]
-
-    def index
-      render :json => model_class.where(global_identifier => global_identifier), :status => :found
-    end
-
-    def show
-      render :json => model_instance, :status => :found
-    rescue ActiveRecord::RecordNotFound => e
-      render :json => { :errors => e.message}, :status => :not_found
-    end
-
-    def create
-      if data_table.new_record_strategy == :update
-        model = model_class.find_or_initialize_by(global_identifier => model_params[global_identifier])
-        model.update_attributes(model_params)
-        render :json => model, :status => :ok
-      else
-        render :json => model_class.create!(model_params), :status => :created
-      end
-    rescue StandardError => e
-      render :json => { :errors => e.message}, :status => :unprocessable_entity
-    end
-
-    def update
-      model_instance.update_attributes!(model_params)
-      render :json => model_instance, :status => :ok
-    rescue ActiveRecord::RecordNotFound => e
-      render :json => { :errors => e.message}, :status => :not_found
-    rescue StandardError => e
-      render :json => { :errors => e.message}, :status => :unprocessable_entity
-    end
-
-    def destroy
-      model_instance.delete
-      head :no_content
-    rescue ActiveRecord::RecordNotFound => e
-      render :json => { :errors => e.message}, :status => :not_found
-    end
-
-    private
-
-    def authenticate
-      return unless Gatherable.config.auth_method == :session
-      head :unauthorized unless params[global_identifier] == session[global_identifier]
-    end
-
-    def model_instance
-      model_class.find_by!(params.slice(model_id, global_identifier))
-    end
-
-    def model_class
-      Gatherable.const_get(unmodularized_model_name)
-    end
-
-    def model_name
-      self.class.to_s.chomp('Controller').singularize
-    end
-
-    def model_id
-      "#{model_name_as_var}_id"
-    end
-
-    def unmodularized_model_name
-      model_name.split('::').last
-    end
-
-    def model_name_as_var
-      unmodularized_model_name.underscore
-    end
-
-    def model_params
-      params.require(model_name_as_var).permit(
-        *model_class.column_names
-      ).merge(global_identifier => params[global_identifier])
-    end
-
-    def global_identifier
-      Gatherable.config.global_identifier
-    end
-
-    def data_table
-      DataTable.find_by_name(model_name_as_var)
-    end
-  end
-end