cells-rails 0.0.7 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 05ee3c22a3ba550a3b49e0211f09027266ba2b1d
-  data.tar.gz: 2138fec9accdbe789f88899b84458e7c605c9992
+SHA256:
+  metadata.gz: 260cc70d64299766c8bf4fb71c07842c2bd159d22fa0dac7f2f95c14bf508d5e
+  data.tar.gz: 5187ab95f256a3dde5da97008642f36653a54c81d93b36b0a6a92045a624c49e
 SHA512:
-  metadata.gz: 09e7bd48a9fec96bff53f3243323412d655c7a5b9c5b2b23022c60e5926e4ec5da180badc27bf59e04335fa0de1b69b42336a4b76355e601608968e87a605bd1
-  data.tar.gz: 46282c8f28d538c0984dd857ba67e8ba0f35a6153d275475077c85fe45d0af87b4fbf16fa11906878e2c02a3b05e7c2b7098ad45b2c904fb6d039e219977c3eb
+  metadata.gz: 6e178bdcd28798e3f1e613145e164dbe2f38edb606a9b376407357daca42ca000224c579d5af483206d4b7ee262a6132fb421ecd690fc9ed0494fbcd906d973d
+  data.tar.gz: 9895f1f7d41a2ce2408ca8f455db29ca418498b64e3232e631823b82d022bf9aae56927429869da6240b913aa917f90303581574498976bb10c2a41d284d1e1e

data/.gitignore

@@ -1,4 +1,4 @@
-/.bundle/
+.bundle/
 /.yardoc
 /Gemfile.lock
 /_yardoc/
@@ -6,4 +6,9 @@
 /doc/
 /pkg/
 /spec/reports/
-/tmp/
+/log
+tmp
+.DS_Store
+log/
+*.iml
+.idea

data/.travis.yml

@@ -1,13 +1,19 @@
 language: ruby
 rvm:
-  - ruby-head
-  - 2.2
-  - 2.1
-  - 2.0.0
-  - 1.9.3
-  - jruby-19mode
-gemfile:
-  - gemfiles/rails4.2.gemfile
-  - gemfiles/rails4.1.gemfile
-  - gemfiles/rails4.0.gemfile
-  - gemfiles/rails3.2.gemfile
+    - 2.4.7
+    - 2.5.6
+    - 2.6.4
+env:
+  - "RAILS_VERSION=5.0"
+  - "RAILS_VERSION=5.1"
+  - "RAILS_VERSION=5.2"
+  - "RAILS_VERSION=6.0"
+matrix:
+  fast_finish: true
+  exclude:
+    - rvm: 2.3.8
+      env: RAILS_VERSION=6.0
+    - rvm: 2.4.7
+      env: RAILS_VERSION=6.0
+
+cache: bundler

data/CHANGES.md

@@ -1,3 +1,23 @@
+## 0.1.2
+
+* Fix `LocalJumpError` from our Railtie.
+
+## 0.1.1
+
+* The `Cell.view_paths` are now set automatically for `Trailblazer::Cell`s, too, if the gem is present. This allows starting Rails in daemon mode `rails s -d` and cells finding its views.
+
+## 0.1.0
+
+* Support for Rails 6.0 Thank to @Szeliga
+
+## 0.0.9
+
+* Prevent Forwardable from printing warnings in Ruby 2.4+
+
+## 0.0.8
+
+* Fix testing for `rspec-cells` in combination with Rails 5.1. Thanks @tiagoamaro.
+
 ## 0.0.7
 
 * Add `config.cells.include_template_engine = false` to turn off automatic

data/Gemfile

@@ -5,9 +5,15 @@ gemspec
 
 # gem "my_engine", path: "engines/my_engine"
 
-# gem 'sass-rails', "~> 4.0.3"#, "  ~> 3.1.0"
+gem 'sass-rails', "~> 6.0.0"
 # gem "sprockets", "~> 2.12.3"
 
+rails_version = ENV.fetch('RAILS_VERSION','5.0')
+gem "railties", "~> #{rails_version}"
+gem "activerecord", "~> #{rails_version}"
+
+gem "my_engine", path: "test/rails#{rails_version}/engines/my_engine"
+
 group :development, :test do
   gem "minitest-spec-rails"
   gem "capybara_minitest_spec"

data/README.md

@@ -1,4 +1,5 @@
 # Cells::Rails
+[![Build Status](https://travis-ci.org/trailblazer/cells-rails.svg?branch=master)](https://travis-ci.org/trailblazer/cells-rails)
 
 [Cells](https://github.com/apotonick/cells) is a generic view model implementation for Ruby. Cells-rails brings Rails-specific bindings.
 
@@ -21,4 +22,4 @@ gem 'cells-rails'
 
 ## License
 
-The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
+The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/Rakefile

@@ -1,10 +1,12 @@
 require "bundler/gem_tasks"
 require "rake/testtask"
 
+RAILS_VERSION = ENV.fetch('RAILS_VERSION','5.0')
+
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"
   t.libs << "lib"
-  t.test_files = FileList['test/**/*_test.rb']
+  t.test_files = FileList["test/rails#{RAILS_VERSION}/**/*_test.rb"]
 end
 
 task :default => :test

data/cells-rails.gemspec

@@ -18,12 +18,13 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "cells", ">= 4.1.6", "< 5.0.0"
-  spec.add_dependency "actionpack", ">= 3.0"
+  spec.add_dependency "actionpack", ">= 5.0"
 
 
-  spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "rails"
   spec.add_development_dependency "cells-erb"
+  spec.add_development_dependency "sass-rails"
 end

data/lib/cell/helper/asset_helper.rb

@@ -15,11 +15,13 @@ module Cell
         asset_path
         asset_url
         image_tag
+        video_tag
         audio_path
         audio_url
         compute_asset_extname
         compute_asset_host
         compute_asset_path
+        favicon_link_tag
         font_path
         font_url
         image_path

data/lib/cell/rails.rb

@@ -1,3 +1,4 @@
+require 'active_support/concern'
 module Cell
   def self.rails_version
     Gem::Version.new(ActionPack::VERSION::STRING)
@@ -45,9 +46,9 @@ module Cell
       # include ActionController::RequestForgeryProtection
       included do
         extend Uber::Delegates
-        delegates :parent_controller, :session, :params, :request, :config, :env, :url_options
+        delegates :parent_controller, :session, :params, :request, :config, :env, :url_options, :default_url_options
         # forgery protection.
-        delegates :parent_controller, :protect_against_forgery?, :form_authenticity_token, :request_forgery_protection_token
+        delegates :parent_controller, :request_forgery_protection_token
       end
 
       def call(*)
@@ -67,6 +68,20 @@ module Cell
         ::ActionController::Base.cache_store
       end
 
+      # In Ruby 2.4.0+, Forwardable prints a warning when you delegate
+      # to a private or protected method - so `delegates :protect_against_forgery?`
+      # or `delegates :form_authenticity_token` will print warnings all
+      # over the place
+      #
+      # This workaround prevents warnings being printed
+      def protect_against_forgery?
+        controller.send(:protect_against_forgery?)
+      end
+
+      def form_authenticity_token(*args)
+        controller.send(:form_authenticity_token, *args)
+      end
+
       module ClassMethods
         def expand_cache_key(key)
           ::ActiveSupport::Cache.expand_cache_key(key, :cells)

data/lib/cell/rails/testing.rb

@@ -2,17 +2,25 @@ module Cell
   module RailsExtensions
     # This modules overrides Cell::Testing#controller_for and provides Rails-specific logic.
     module Testing
+      RAILS_7_0 = Gem::Version.new("7.0.0")
+      RAILS_5_1 = Gem::Version.new("5.1.0")
+      RAILS_5_0 = Gem::Version.new("5.0.0")
+
       def controller_for(controller_class)
         return unless controller_class
 
         controller_class.new.tap do |ctl|
-          ctl.request = action_controller_test_request
+          ctl.request = action_controller_test_request(controller_class)
           ctl.instance_variable_set :@routes, ::Rails.application.routes.url_helpers
         end
       end
 
-      def action_controller_test_request
-        if ::Rails.version.start_with?('5')
+      def action_controller_test_request(controller_class)
+        version = ::Rails.gem_version
+
+        if version >= RAILS_5_1 && version < RAILS_7_0
+          ::ActionController::TestRequest.create(controller_class)
+        elsif version >= RAILS_5_0 && version < RAILS_5_1
           ::ActionController::TestRequest.create
         else
           ::ActionController::TestRequest.new

data/lib/cell/railtie.rb

@@ -14,6 +14,9 @@ module Cell
 
     # ruthlessly stolen from the zurb-foundation gem.
     initializer "cells.update_asset_paths" do |app|
+      # Add Rails.root to view_paths
+      Cell::ViewModel.view_paths = [Rails.root.join("app", "cells")]
+
       Array(app.config.cells.with_assets).each do |cell_class|
         # puts "@@@@@ #{cell_class.camelize.constantize.prefixes}"
         app.config.assets.paths += cell_class.camelize.constantize.prefixes # Song::Cell.prefixes
@@ -54,7 +57,7 @@ module Cell
       end
     end
 
-    IncludeTemplateModules = -> (app) do
+    IncludeTemplateModules = ->(app) do
       return if app.config.cells.include_template_engine == false
 
       # yepp, this is happening. saves me a lot of coding in each extension.
@@ -73,6 +76,13 @@ module Cell
       end
     end
 
+    initializer "trailblazer.cells.update_view_paths" do |app|
+      if Object.const_defined?(:Trailblazer) && Trailblazer.const_defined?(:Cell)
+        # Add Rails.root to view_paths
+        Trailblazer::Cell.view_paths = [Rails.root.join("app", "concepts")]
+      end
+    end
+
     rake_tasks do
       load "tasks/cells.rake"
     end

data/lib/cells-rails.rb

@@ -1 +1,2 @@
+require "cells/rails/version"
 require "cells/rails"

data/lib/cells/rails.rb

@@ -1,9 +1,6 @@
-require "cells/rails/version"
 require "cells"
-
-require "cell/caching/notification"
-require "cell/rails"
 require "cell/railtie"
+require "cell/caching/notification"
 require "cell/rails/testing"
 
 module Cell

data/lib/cells/rails/version.rb

@@ -1,5 +1,5 @@
 module Cells
   module Rails
-    VERSION = "0.0.7"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cells-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.2
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-28 00:00:00.000000000 Z
+date: 2020-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cells
@@ -36,42 +36,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -114,6 +114,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sass-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - apotonick@gmail.com
@@ -175,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.3
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Convenient Rails support for Cells.