weeler 1.0.2 → 1.0.3

data/spec/controllers/translations_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Weeler::TranslationsController do
+describe Weeler::TranslationsController, type: :controller do
 
   before do
     routes.draw do
@@ -98,7 +98,7 @@ describe Weeler::TranslationsController do
     context "no file" do
       it "redirects back" do
         post "import"
-        response.should redirect_to :weeler_translations
+        expect(response).to redirect_to :weeler_translations
       end
 
     end

data/spec/dummy/config/environments/production.rb

@@ -20,7 +20,7 @@ Dummy::Application.configure do
   # config.action_dispatch.rack_cache = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this).
-  config.serve_static_assets = false
+  config.serve_static_files = false
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :uglifier

data/spec/dummy/config/environments/test.rb

@@ -13,7 +13,7 @@ Dummy::Application.configure do
   config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_assets  = true
+  config.serve_static_files  = true
   config.static_cache_control = "public, max-age=3600"
 
   # Show full error reports and disable caching.

data/spec/routing/routes_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Weeler::Engine.routes do
+describe Weeler::Engine.routes, type: :routing do
 
 
   after(:all) do

data/spec/spec_helper.rb

@@ -12,14 +12,10 @@ ENV['RAILS_ENV'] ||= 'test'
 
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 require 'rspec/rails'
-require 'rspec/autorun'
 require 'factory_girl'
 require 'capybara/rspec'
 require 'database_cleaner'
-# require 'capybara-webkit'
 require 'shoulda-matchers'
-# require 'support/helpers'
-# require 'timecop'
 
 Rails.backtrace_cleaner.remove_silencers!
 # Load support files

data/spec/weeler/action_controller/acts/restful_spec.rb

@@ -1,19 +1,25 @@
 require 'spec_helper'
 
-describe Weeler::ActionController::Acts::Restful, :type => :controller do
+class Weeler::FoosController < Weeler::ContentController; end
+
+describe Weeler::ActionController::Acts::Restful, type: :controller do
 
   before(:each) do
     FactoryGirl.create_list(:dummy_post, 2)
   end
 
-  before(:all) do
-    Dummy::Application.reload_routes!
+  before do
+    routes.draw do
+      mount_weeler_at "/weeler-admin" do
+        weeler_resources :foos
+      end
+    end
   end
 
-  describe "acts_as_restful", :type => :controller do
+  describe "acts_as_restful" do
 
     context "permited title with array" do
-      controller(Weeler::ContentController) do
+      controller Weeler::FoosController do
         acts_as_restful Post, permit_params: [:title]
       end
 
@@ -25,12 +31,16 @@ describe Weeler::ActionController::Acts::Restful, :type => :controller do
 
       describe "actions" do
         describe "GET #index" do
-          it "returns success" do
+          specify "index returns success" do
+            routes.draw { get "index" => "weeler/foos#index" }
+
             get "index"
-            response.should be_success
+            expect(response).to be_success
           end
 
-          it "assigns posts" do
+          specify "assigns posts" do
+            routes.draw { get "index" => "weeler/foos#index" }
+
             get "index"
             expect(assigns(:items).size).to eq(2)
           end
@@ -38,9 +48,15 @@ describe Weeler::ActionController::Acts::Restful, :type => :controller do
 
         describe "POST #create" do
           it "redirects to edit path" do
+            # routes.draw do
+            #   mount_weeler_at "/weeler-admin" do
+            #     weeler_resources :foos
+            #   end
+            # end
+
             post "create", post: attributes_for(:dummy_post)
             post = Post.last
-            expect(response).to redirect_to("http://test.host/anonymous/#{post.id}/edit")
+            expect(response).to redirect_to("http://test.host/weeler-admin/foos/#{post.id}/edit")
           end
 
           it "sets only permited params" do
@@ -54,14 +70,14 @@ describe Weeler::ActionController::Acts::Restful, :type => :controller do
         describe "GET #edit" do
           it "returns success status" do
             get "edit", id: Post.last.id
-            response.should be_success
+            expect(response).to be_success
           end
         end
 
         describe "GET #new" do
           it "returns success status" do
             get "new"
-            response.should be_success
+            expect(response).to be_success
           end
         end
 
@@ -84,7 +100,7 @@ describe Weeler::ActionController::Acts::Restful, :type => :controller do
         end
 
         specify "POST #order" do
-          routes.draw { post "order" => "anonymous#order" }
+          routes.draw { post "order" => "weeler/foos#order" }
 
           post "order", orders: "order[]=2&order[]=1"
           post1 = Post.order(sequence: :asc).first
@@ -97,7 +113,7 @@ describe Weeler::ActionController::Acts::Restful, :type => :controller do
     end
 
     context "no permited params" do
-      controller(Weeler::ContentController) do
+      controller Weeler::FoosController do
         acts_as_restful Post
       end
 
@@ -111,15 +127,15 @@ describe Weeler::ActionController::Acts::Restful, :type => :controller do
           end
 
           it "warns developer" do
-            controller.should_receive(:warn).with("[UNPERMITED PARAMS] To permiting {\"title\"=>\"Foo lala\", \"body\"=>\"Heila\"} params, add 'permit_params: [:title, :body]' option to 'acts_as_restful'")
-            post "create", post: attributes_for(:dummy_post, title: "Foo lala", body: "Heila")
+            warning_message = "[UNPERMITED PARAMS] To permiting {\"title\"=>\"Foo lala\", \"body\"=>\"Heila\"} params, add 'permit_params: [:title, :body]' option to 'acts_as_restful'\n"
+            expect { post("create", post: attributes_for(:dummy_post, title: "Foo lala", body: "Heila")) }.to output(warning_message).to_stderr
           end
         end
       end
     end
 
     context "permited all with block" do
-      controller(Weeler::ContentController) do
+      controller Weeler::FoosController do
         acts_as_restful Post, permit_params: -> (params) { params.require(:post).permit! }
       end
 
@@ -137,7 +153,7 @@ describe Weeler::ActionController::Acts::Restful, :type => :controller do
     end
 
     context "permited all with block" do
-      controller(Weeler::ContentController) do
+      controller Weeler::FoosController do
         acts_as_restful Post, order_by: {id: :desc}, permit_params: [:title]
       end
 

data/spec/weeler/action_view/helpers/form_helper_spec.rb

@@ -5,22 +5,23 @@ describe Weeler::ActionView::Helpers::FormHelper, :type => :helper do
   let(:resource)  { FactoryGirl.create :dummy_post }
   let(:helper)    { ActionView::Helpers::FormBuilder.new(:post, resource, self, {})}
 
-  describe :image_upload_field do
-    let(:output)    {
-      helper.image_upload_field :image
-    }
+  let(:output)    {
+    helper.image_upload_field :image
+  }
 
-    it 'create file field' do
-      expect(output).to include '<input class="form-control" id="post_image" name="post[image]" type="file" />'
-    end
+  it 'create file field' do
+    expect(output).to include 'type="file"'
+    expect(output).to include 'name="post[image]"'
+  end
 
-    it 'creates a label' do
-      expect(output).to include '<label'
-    end
+  it 'creates a label' do
+    expect(output).to include '<label'
+  end
 
-    it "creates img preview tag" do
-      expect(output).to include '<img alt="Original" src="'+ Rails.root.join('sample/original.png').to_s+'" style="height: 80px;" />'
-    end
+  it "creates img preview tag" do
+    expect(output).to include '<img'
+    expect(output).to include 'src="'+ Rails.root.join('sample/original.png').to_s+'"'
+    expect(output).to include 'style="height: 80px;"'
   end
 
 end

data/spec/weeler/action_view/helpers/translation_helper_spec.rb

@@ -2,15 +2,12 @@ require 'spec_helper'
 
 describe Weeler::ActionView::Helpers::TranslationHelper, :type => :helper do
 
-  describe :translate do
+  let(:output)    {
+    helper.translate "not.existing.key"
+  }
 
-    let(:output)    {
-      helper.translate "not.existing.key"
-    }
-
-    it 'dont renders key' do
-      expect(output).to eq('<span class="translation_missing" title="translation missing: en.not.existing.key">Key</span>')
-    end
+  it 'dont renders key' do
+    expect(output).to eq('<span class="translation_missing" title="translation missing: en.not.existing.key">Key</span>')
   end
 
 end

data/spec/weeler/i18n/backend/weeler_spec.rb

@@ -20,7 +20,7 @@ describe I18n::Backend::Weeler do
 
   describe "#reload_cache" do
     it "clears translations cache" do
-      Weeler.i18n_cache.should_receive(:clear)
+      expect(Weeler.i18n_cache).to receive(:clear)
       I18n.backend.backends[0].reload_cache
     end
 
@@ -61,8 +61,7 @@ describe I18n::Backend::Weeler do
 
     it "runs kernel if translation is_proc" do
       proc = I18n::Backend::Weeler::Translation.create(:key => 'valid', :value => "p 'This ir proc!'", :locale => :en, :is_proc => true)
-      Kernel.should_receive(:p).with("This ir proc!")
-      proc.value
+      expect { proc.value }.to output("\"This ir proc!\"\n").to_stdout
     end
 
   end
@@ -150,8 +149,8 @@ describe I18n::Backend::Weeler do
   describe "#lookup" do
 
     it "show warning" do
-      I18n::Backend::Weeler::Translation.should_receive(:warn).with("[DEPRECATION] Giving a separator to Translation.lookup is deprecated. You can change the internal separator by overwriting FLATTEN_SEPARATOR.")
-      I18n::Backend::Weeler::Translation.lookup("foo", "|")
+      warning_message = "[DEPRECATION] Giving a separator to Translation.lookup is deprecated. You can change the internal separator by overwriting FLATTEN_SEPARATOR.\n"
+      expect { I18n::Backend::Weeler::Translation.lookup("foo", "|") }.to output(warning_message).to_stderr
     end
 
     context "cache" do
@@ -161,7 +160,7 @@ describe I18n::Backend::Weeler do
         end
 
         it "reloads cache" do
-          I18n.backend.backends[0].should_receive(:reload_cache)
+          expect(I18n.backend.backends[0]).to receive(:reload_cache)
           I18n.t("cancel", scope: "admin.content")
         end
       end
@@ -172,7 +171,7 @@ describe I18n::Backend::Weeler do
         end
 
         it "does not reload cache" do
-          I18n.backend.backends[0].should_not_receive(:reload_cache)
+          expect(I18n.backend.backends[0]).not_to receive(:reload_cache)
           I18n.t("cancel", scope: "admin.content")
         end
       end

data/spec/weeler/i18n/humanize_missing_translations_spec.rb

@@ -10,7 +10,7 @@ describe I18n::HumanizeMissingTranslations do
 
     context "when exception is not I18n::MissingTranslation" do
       it "does not intercept it" do
-        I18n::Backend::Transliterator.stub(:get).and_raise(I18n::ArgumentError)
+        allow(I18n::Backend::Transliterator).to receive(:get).and_raise(I18n::ArgumentError)
         expect{I18n.transliterate("error?")}.to raise_error(I18n::ArgumentError)
       end
     end

data/weeler.gemspec

@@ -4,38 +4,38 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'weeler/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "weeler"
+  spec.name          = 'weeler'
   spec.version       = Weeler::VERSION::STRING
-  spec.authors       = ["Artūrs Braučs",  "Artis Raugulis"]
-  spec.email         = ["arturs@weby.lv", "artis@devart.lv"]
+  spec.authors       = ['Artūrs Braučs',  'Artis Raugulis']
+  spec.email         = ['arturs.braucs@gmail.com', 'artis@devart.lv']
   spec.description   = %q{CMS for weby.lv projects.}
   spec.summary       = %q{CMS for weby.lv projects.}
-  spec.homepage      = ""
-  spec.license       = "MIT"
+  spec.homepage      = ''
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_dependency "rails", ">= 4"
-  spec.add_dependency "i18n"
-  spec.add_dependency "rails-settings-cached"
-  spec.add_dependency "globalize"
+  spec.add_dependency 'rails', '>= 4'
+  spec.add_dependency 'i18n'
+  spec.add_dependency 'rails-settings-cached'
+  spec.add_dependency 'globalize'
 
-  spec.add_dependency "kaminari"
-  spec.add_dependency "haml"
-  spec.add_dependency "sass-twitter-bootstrap-rails"
-  spec.add_dependency "jquery-turbolinks"
-  spec.add_dependency "jquery-ui-rails"
+  spec.add_dependency 'kaminari'
+  spec.add_dependency 'haml'
+  spec.add_dependency 'sass-twitter-bootstrap-rails'
+  spec.add_dependency 'jquery-turbolinks'
+  spec.add_dependency 'jquery-ui-rails'
 
-  spec.add_dependency "axlsx"
-  spec.add_dependency "roo"
+  spec.add_dependency 'axlsx'
+  spec.add_dependency 'roo'
 
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", "< 3.0.0"
-  spec.add_development_dependency 'rspec-rails', "< 3.0.0"
+  spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rspec-rails'
   spec.add_development_dependency 'webrat'
   spec.add_development_dependency 'capybara'
   spec.add_development_dependency 'factory_girl_rails'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: weeler
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Artūrs Braučs
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-08 00:00:00.000000000 Z
+date: 2015-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -197,30 +197,30 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webrat
   requirement: !ruby/object:Gem::Requirement
@@ -321,7 +321,7 @@ dependencies:
         version: '0'
 description: CMS for weby.lv projects.
 email:
-- arturs@weby.lv
+- arturs.braucs@gmail.com
 - artis@devart.lv
 executables: []
 extensions: []
@@ -338,18 +338,15 @@ files:
 - app/.DS_Store
 - app/assets/.DS_Store
 - app/assets/javascripts/.DS_Store
-- app/assets/javascripts/weeler/.DS_Store
 - app/assets/javascripts/weeler/app/index.js
 - app/assets/javascripts/weeler/init.js.coffee
 - app/assets/javascripts/weeler/lib/flash.js
 - app/assets/javascripts/weeler/lib/sortable.js
-- app/assets/javascripts/weeler/vendor/.DS_Store
 - app/assets/javascripts/weeler/vendor/bootstrap.file-input.js
 - app/assets/javascripts/weeler/vendor/bootstrap.js
 - app/assets/javascripts/weeler/vendor/bootstrap.rowlink.js
 - app/assets/javascripts/weeler/vendor/bootstrap.switch.js
 - app/assets/stylesheets/.DS_Store
-- app/assets/stylesheets/weeler/.DS_Store
 - app/assets/stylesheets/weeler/app/index.css
 - app/assets/stylesheets/weeler/init.css.erb
 - app/assets/stylesheets/weeler/style.css.scss
@@ -357,7 +354,6 @@ files:
 - app/assets/stylesheets/weeler/vendor/bootstrap.rowlink.css
 - app/assets/stylesheets/weeler/vendor/bootstrap.spinner.css
 - app/assets/stylesheets/weeler/vendor/bootstrap.switch.css
-- app/assets/stylesheets/weeler/vendor/jquery.pnotify.css
 - app/controllers/concerns/weeler/section_seo.rb
 - app/controllers/weeler/administration_controller.rb
 - app/controllers/weeler/application_controller.rb
@@ -545,7 +541,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: CMS for weby.lv projects.