spree_shipping_matrix 0.1.0 → 0.2.0

data/README.md

@@ -4,8 +4,10 @@ Advanced shipping calculator based on rules matrix for Spree.
 
 [![Code Climate](https://codeclimate.com/github/madebymade/spree_shipping_matrix/badges/gpa.svg)](https://codeclimate.com/github/madebymade/spree_shipping_matrix)
 [![Build Status](https://travis-ci.org/madebymade/spree_shipping_matrix.svg?branch=master)](https://travis-ci.org/madebymade/spree_shipping_matrix)
-[![Brakeman](http://rails-brakeman.com/madebymade/spree_shipping_matrix.png)](http://rails-brakeman.com/madebymade/spree_shipping_matrix)
 [![Test Coverage](https://codeclimate.com/github/madebymade/spree_shipping_matrix/badges/coverage.svg)](https://codeclimate.com/github/madebymade/spree_shipping_matrix)
+[![PullReview stats](https://www.pullreview.com/github/madebymade/spree_shipping_matrix/badges/master.svg?)](https://www.pullreview.com/github/madebymade/spree_shipping_matrix/reviews/master) 
+[![Dependency Status](https://gemnasium.com/madebymade/spree_shipping_matrix.svg)](https://gemnasium.com/madebymade/spree_shipping_matrix) 
+[![Brakeman](http://rails-brakeman.com/madebymade/spree_shipping_matrix.png)](http://rails-brakeman.com/madebymade/spree_shipping_matrix)
 
 ## Installation
 

data/app/helpers/spree/admin/base_helper_decorator.rb

@@ -1,9 +1,11 @@
 Spree::Admin::BaseHelper.module_eval do
+  alias_method :original_preference_field_for, :preference_field_for
+
   def preference_field_for(form, field, options)
     if options[:type] == :matrix_id
       form.matrix_field(field, preference_field_options(options))
     else
-      super
+      original_preference_field_for(form, field, options)
     end
   end
 end

data/app/views/spree/admin/shipping_matrices/edit.html.erb

@@ -1,4 +1,4 @@
-<%= render partial: 'spree/admin/shared/configuration_menu' %>
+<%= render 'spree/admin/shared/configuration_menu' %>
 
 <% content_for :page_title do %>
   <%= Spree.t(:editting, scope: :shipping_matrix) %>
@@ -13,13 +13,12 @@
   </li>
 <% end %>
 
-<%= render partial: 'spree/shared/error_messages',
-           locals: { target: @shipping_matrix } %>
+<%= render 'spree/shared/error_messages', target: @shipping_matrix %>
 
 <%= form_for [:admin, @shipping_matrix] do |f| %>
   <fieldset>
     <legend align="center"><%= Spree.t(:editting, scope: :shipping_matrix) %></legend>
-    <%= render :partial => 'form', :locals => { :f => f } %>
-    <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
+    <%= render 'form', f: f %>
+    <%= render 'spree/admin/shared/edit_resource_links' %>
   </fieldset>
 <% end %>

data/app/views/spree/admin/shipping_matrices/index.html.erb

@@ -1,4 +1,4 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
+<%= render 'spree/admin/shared/configuration_menu' %>
 
 <% content_for :page_title do %>
   <%= Spree.t(:title, scope: :shipping_matrix) %>
@@ -43,9 +43,8 @@
         >
         <td class="align-center"><%= shipping_matrix.name %></td>
         <td class="actions">
-          <%= link_to_edit(shipping_matrix,
-                           class: 'admin_edit_shipping_matrix',
-                           no_text: true) %>
+          <%= link_to_edit(shipping_matrix, class: 'admin_edit_shipping_matrix',
+                                            no_text: true) %>
           <%= link_to_delete(shipping_matrix, no_text: true) %>
         </td>
       </tr>

data/app/views/spree/admin/shipping_matrices/new.html.erb

@@ -1,11 +1,9 @@
-<%= render partial: 'spree/shared/error_messages',
-           locals: { target: @shipping_matrix } %>
+<%= render 'spree/shared/error_messages', target: @shipping_matrix %>
 
 <%= form_for [:admin, @shipping_matrix] do |f| %>
   <fieldset>
     <legend align="center"><%= Spree.t(:new, scope: :shipping_matrix) %></legend>
-    <%= render partial: 'form', locals: { f: f } %>
-
-    <%= render partial: 'spree/admin/shared/new_resource_links' %>
+    <%= render 'form', f: f %>
+    <%= render 'spree/admin/shared/new_resource_links' %>
   </fieldset>
 <% end %>

data/lib/spree_shipping_matrix/factories.rb

@@ -0,0 +1,2 @@
+factory_glob = SpreeShippingMatrix::Engine.root.join('spec/factories/*_factory.rb')
+Dir[factory_glob].each { |f| require f }

data/lib/spree_shipping_matrix/version.rb

@@ -1,3 +1,3 @@
 module SpreeShippingMatrix
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/spec/spec_helper.rb

@@ -12,8 +12,6 @@ require 'ffaker'
 require 'capybara/poltergeist'
 require 'factory_girl'
 
-include(FactoryGirl)
-
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
 Dir[File.join(File.dirname(__FILE__), 'support/**/*.rb')].each { |f| require f }
@@ -27,7 +25,7 @@ require 'spree/testing_support/url_helpers'
 require 'spree/testing_support/order_walkthrough'
 
 # Requires factories defined in lib/spree_shipping_matrix/factories.rb
-Dir[File.join(File.dirname(__FILE__), 'factories/**/*_factory.rb')].each { |f| require f }
+require 'spree_shipping_matrix/factories'
 
 Capybara.default_selector = :css
 Capybara.javascript_driver = :poltergeist

data/spec/support/user_steps.rb

@@ -1,19 +1,15 @@
-def given_i_am_logged_into_the_cms
-  @user = FactoryGirl.create(:admin_user)
-  visit spree.admin_path
+def given_i_am_logged_in(login_path = nil)
+  visit login_path || spree.login_path
+  @user ||= FactoryGirl.create(:user)
   fill_in :spree_user_email, with: @user.email
   fill_in :spree_user_password, with: @user.password
   click_button 'Login'
   @user
 end
 
-def given_i_am_logged_in
-  @user = FactoryGirl.create(:user)
-  visit spree.login_path
-  fill_in :spree_user_email, with: @user.email
-  fill_in :spree_user_password, with: @user.password
-  click_button 'Login'
-  @user
+def given_i_am_logged_into_the_cms
+  @user = FactoryGirl.create(:admin_user)
+  given_i_am_logged_in(spree.admin_path)
 end
 
 def given_i_am_logged_in_as_user_with(role)

data/spec/unit/models/shipping_matrix_rule_spec.rb

@@ -18,13 +18,6 @@ describe Spree::ShippingMatrixRule do
       end
     end
 
-    [:matrix, :role, :min_line_item_total, :amount].each do |field|
-      context "and a ##{field} is not provided" do
-        before(:each) { attrs.delete(field) }
-        it { is_expected.to be_invalid }
-      end
-    end
-
     [:min_line_item_total, :amount].each do |field|
       context "and text value provided for ##{field}" do
         before(:each) { attrs.merge!(field => 'word') }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_shipping_matrix
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-28 00:00:00.000000000 Z
+date: 2014-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -244,6 +244,7 @@ files:
 - lib/generators/spree_shipping_matrix/install/install_generator.rb
 - lib/spree_shipping_matrix.rb
 - lib/spree_shipping_matrix/engine.rb
+- lib/spree_shipping_matrix/factories.rb
 - lib/spree_shipping_matrix/version.rb
 - spec/factories/shipping_matrix_factory.rb
 - spec/factories/shipping_matrix_rule_factory.rb
@@ -277,7 +278,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -729713437542143338
+      hash: -3748712467567725661
 requirements:
 - none
 rubyforge_project: