controller_resources 0.1.2 → 1.0.0

data/spec/dummy/app/views/posts/show.html.erb

@@ -2,13 +2,13 @@
 
 <p>
   <strong>Title:</strong>
-  <%= post.title %>
+  <%= @post.title %>
 </p>
 
 <p>
   <strong>Body:</strong>
-  <%= post.body %>
+  <%= @post.body %>
 </p>
 
-<%= link_to 'Edit', edit_post_path(post) %> |
+<%= link_to 'Edit', edit_post_path(@post) %> |
 <%= link_to 'Back', posts_path %>

data/spec/dummy/db/schema.rb

@@ -22,5 +22,4 @@ ActiveRecord::Schema.define(version: 20150614211054) do
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
   end
-
 end

data/spec/dummy/db/seeds.rb

@@ -1,2 +1,2 @@
-puts 'creating post record'
-Post.create title: 'title', body: 'body'
+# puts 'creating post record'
+# Post.create title: 'title', body: 'body'

data/spec/features/posts_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 RSpec.feature 'posts' do
+  fixtures :posts
+
   let :post do
     posts :post
   end
@@ -20,29 +22,34 @@ RSpec.feature 'posts' do
   end
 
   scenario 'creating a new post' do
-    skip
     visit new_post_path
 
     fill_in 'Title', with: 'new post'
     fill_in 'Body', with: 'this is a new post'
     click_button 'Save'
 
-    expect(page).to have_content 'Listing Posts'
+    expect(page).to have_content 'Post created.'
+    expect(page).to have_content 'Title: new post'
   end
 
   scenario 'editing an existing post' do
-    skip
     visit edit_post_path(post)
 
     fill_in 'Title', with: 'new title'
     click_button 'Save'
 
-    expect(page).to have_content 'new title'
+    expect(page).to have_content 'Post updated.'
+    expect(page).to have_content 'Title: new title'
   end
 
   scenario 'deleting an existing post' do
-    visit posts_path(post, method: :delete)
+    visit posts_path
+
+    within "#post-#{post.id}" do
+      click_link 'Destroy'
+    end
 
-    expect(page).to have_content 'Listing Posts'
+    expect(page).to have_content 'Post deleted'
+    expect(page).not_to have_content post.title
   end
 end

data/spec/lib/controller_resources_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+class TestController
+  include ControllerResources
+
+  def self.before_action(*args)
+    true
+  end
+
+  resource :comment, ancestor: :post
+end
+
+
+RSpec.describe ControllerResources do
+  let :controller do
+    TestController
+  end
+
+  it 'can be included into a controller' do
+    expect(controller.ancestors).to include(ControllerResources)
+  end
+
+  it 'defines resource name' do
+    expect(controller.resource_name).to eq 'comment'
+  end
+
+  it 'defines ancestor name' do
+    expect(controller.resource_ancestor_name).to eq 'post'
+  end
+
+  it 'has default collection actions but can add over time' do
+    expect(controller.collection_actions).to eq([:index])
+    controller.collection_actions << :show
+    expect(controller.collection_actions).to eq([:index, :show])
+  end
+end

data/spec/spec_helper.rb

@@ -7,12 +7,8 @@ ENV['RAILS_ENV'] ||= 'test'
 require File.expand_path("../dummy/config/environment.rb", __FILE__)
 require 'rspec/rails'
 require 'capybara/rspec'
-# require 'capybara/poltergeist'
-require 'database_cleaner'
 require 'pry'
-
-# Perform all DB operations within a transaction.
-DatabaseCleaner.strategy = :transaction
+# require 'rails/test_help'
 
 # Clean backtraces
 Rails.backtrace_cleaner.remove_silencers!
@@ -20,8 +16,6 @@ Rails.backtrace_cleaner.remove_silencers!
 # Load support files
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
-# Capybara.javascript_driver = :poltergeist
-
 # Configure RSpec with `--init`-based options.
 RSpec.configure do |config|
   config.fixture_path = File.expand_path('../fixtures', __FILE__)
@@ -101,12 +95,4 @@ RSpec.configure do |config|
   # test failures related to randomization by passing the same `--seed` value
   # as the one that triggered the failure.
   Kernel.srand config.seed
-
-  config.before do
-    DatabaseCleaner.start
-  end
-
-  config.after do
-    DatabaseCleaner.clean
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: controller_resources
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Tom Scott
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-26 00:00:00.000000000 Z
+date: 2016-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -182,30 +182,16 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4'
-- !ruby/object:Gem::Dependency
-  name: decent_exposure
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0'
 description: ! "A controller DSL for Rails that allows you to easily and quickly define
   both singular and collection model resources that can be operated on within the
   controller.Attempts to DRY up most of the boilerplate code at the top of\n    each
@@ -247,9 +233,6 @@ files:
 - bin/yri
 - controller_resources.gemspec
 - lib/controller_resources.rb
-- lib/controller_resources/engine.rb
-- lib/controller_resources/extension.rb
-- lib/controller_resources/not_defined_error.rb
 - lib/controller_resources/version.rb
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
@@ -307,7 +290,7 @@ files:
 - spec/features/posts_spec.rb
 - spec/fixtures/posts.yml
 - spec/integration/navigation_spec.rb
-- spec/lib/controller_resources/extension_spec.rb
+- spec/lib/controller_resources_spec.rb
 - spec/spec_helper.rb
 - spec/support/posts.rb
 homepage: https://github.com/tubbo/controller_resources
@@ -367,9 +350,6 @@ test_files:
 - bin/yri
 - controller_resources.gemspec
 - lib/controller_resources.rb
-- lib/controller_resources/engine.rb
-- lib/controller_resources/extension.rb
-- lib/controller_resources/not_defined_error.rb
 - lib/controller_resources/version.rb
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
@@ -427,6 +407,6 @@ test_files:
 - spec/features/posts_spec.rb
 - spec/fixtures/posts.yml
 - spec/integration/navigation_spec.rb
-- spec/lib/controller_resources/extension_spec.rb
+- spec/lib/controller_resources_spec.rb
 - spec/spec_helper.rb
 - spec/support/posts.rb

data/lib/controller_resources/engine.rb

@@ -1,9 +0,0 @@
-module ControllerResources
-  # Configures the +ControllerResources+ to be isolated and
-  # eager-loaded.
-  class Engine < ::Rails::Engine
-    isolate_namespace ControllerResources
-
-    config.eager_load_namespaces << ControllerResources
-  end
-end

data/lib/controller_resources/extension.rb

@@ -1,147 +0,0 @@
-module ControllerResources
-  # The DSL mixin for ActionController that allows you to quickly define
-  # both singular and collection model resources that can be operated on
-  # within the controller. Attempts to DRY up most of the boilerplate code
-  # at the top of each controller used to set up its state.
-  #
-  # @author Tom Scott
-  #
-  # @example
-  #
-  #   class PostsController < ApplicationController
-  #     resource :post do
-  #       permit :title, :body, :author_id
-  #     end
-  #
-  #     def index
-  #       respond_with posts
-  #     end
-  #
-  #     def show
-  #       respond_with post
-  #     end
-  #
-  #     def create
-  #       post.save
-  #       respond_with post
-  #     end
-  #
-  module Extension
-    extend ActiveSupport::Concern
-
-    included do
-      # Given name of the model as supplied to the +resource+ directive.
-      #
-      # @attr_accessor [Symbol]
-      class_attribute :model_name
-
-      # Collection name computed by pluralizing the given model name.
-      #
-      # @attr_accessor [Symbol]
-      class_attribute :collection_name
-
-      # A collection of arguments supplied to +StrongParameters#permit+
-      # that is used in the +edit_params+ method to easily define
-      # attributes which need to be whitelisted for mass assignment.
-      #
-      # @attr_accessor [Array]
-      class_attribute :params_to_permit
-
-      # Configures +DecentExposure+ to use the +edit_params+ method
-      # defined by this module as the default attributes for mass
-      # assignment.
-      decent_configuration do
-        attributes :edit_params
-      end
-
-      helper_method :model, :collection
-    end
-
-    class_methods do
-      # Define resources based on the given name and decent exposure
-      # options. Uses +DecentExposure+ to define said resources and
-      # stores the generated names in the controller's configuration.
-      #
-      # If a block is given, one can also call additional DSL methods
-      # like +permit+.
-      #
-      # @param [Symbol] name - the name of the model exposure, which
-      # is pluralized to compute the name of the collection exposure and
-      # stored to +model_name+.
-      # @param [Hash] options - passed wholesale to both +expose+ methods,
-      # and useful for defining custom +DecentExposure+ options.
-      # @param &block - a block that is yielded after +expose+ methods are
-      # defined, and used primarily to set permittable params.
-      # @example
-      #
-      #   expose :author
-      #   resource :post, ancestor: :author
-      #
-      def resource(name, options = {})
-        self.model_name = name
-        self.collection_name = "#{name}".pluralize.to_sym
-
-        expose model_name, options
-        expose collection_name, options
-
-        yield if block_given?
-      end
-
-      private
-
-      # Permit the given attributes in +StrongParameters+.
-      #
-      # @example
-      #
-      #   expose :author
-      #   resource :post, ancestor: :author do
-      #     permit :title, :body
-      #   end
-      #
-      def permit(*permittable_params)
-        self.params_to_permit = permittable_params
-      end
-    end
-
-    # Reader method for the defined singular resource.
-    #
-    # @return [Object] the model object or +nil+ if no resource has been
-    # defined.
-    def model
-      return unless resource?
-      public_send model_name
-    end
-
-    # Reader method for the defined collection resource.
-    #
-    # @return [Object] the collection of models or +nil+ if no resource
-    # has been defined.
-    def collection
-      return unless resource?
-      public_send collection_name
-    end
-
-    # White-listed parameters for mass assignment as defined by
-    # +StrongParameters+. Throws a +ControllerResources::NotDefinedError+
-    # if no +resource+ block has been defined on this controller.
-    #
-    # @return [ActionController::Parameters] the +StrongParameters+ hash.
-    # @raise [ControllerResources::NotDefinedError] when no +resource+ has
-    # been defined on this controller.
-    def edit_params
-      fail NotDefinedError unless resource?
-      return params.require(model_name).permit! unless params_to_permit.present?
-      params.require(model_name).permit(*params_to_permit)
-    end
-
-    private
-
-    # Whether a +resource+ directive has been invoked on this controller.
-    #
-    # @private
-    # @return [Boolean]
-    def resource?
-      model_name.present?
-    end
-  end
-end

data/lib/controller_resources/not_defined_error.rb

@@ -1,12 +0,0 @@
-module ControllerResources
-  # Thrown when a +resource+ has not been defined, yet the controller
-  # attempts to call the generated +edit_params+ method.
-  class NotDefinedError < RuntimeError
-    def initialize(*args)
-      super
-      @message = %(
-        Call to #edit_params failed: Resource not defined.
-      )
-    end
-  end
-end

data/spec/lib/controller_resources/extension_spec.rb

@@ -1,46 +0,0 @@
-require 'spec_helper'
-
-module ControllerResources
-  RSpec.describe Extension, type: :lib do
-    subject do
-      TestController.new
-    end
-
-    before do
-      subject.class_eval do
-        include Extension
-
-        resource :post do
-          permit :title
-        end
-      end
-
-      allow(subject).to receive(:params).and_return(
-        double('Parameters', require: double('Required', permit: true))
-      )
-    end
-
-    it 'defines model_name' do
-      expect(subject.model_name).to eq :post
-    end
-
-    it 'defines collection_name' do
-      expect(subject.collection_name).to eq :posts
-    end
-
-    it 'computes model from model_name' do
-      expect(subject).to respond_to :model
-      expect(subject.post).to eq subject.model
-    end
-
-    it 'computes collection from collection_name' do
-      expect(subject).to respond_to :collection
-      expect(subject.collection).to include(subject.model)
-      expect(subject.posts).to eq subject.collection
-    end
-
-    it 'defines edit_params' do
-      expect(subject.edit_params).to be_present
-    end
-  end
-end