render_with_view 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: dd04d6b67b1beecdd49900563e12f702af15b8fa
-  data.tar.gz: 94e175806972868258a5a8fc8dcd3a08d2177b3c
+SHA256:
+  metadata.gz: 8aa151fcf7f21842f19aac1b46c4e94fa525a1ba00beff1f4034042153100faf
+  data.tar.gz: ae2a1259739e9bc8c2de8237c0631e2385ec7a3cbef82e4afbea99016e04345c
 SHA512:
-  metadata.gz: 406d125e96f6caf8b639d00a4747a2d05e24ba89e008d37ed10e238051d320da22ff62cd36983beaee1ed968b6b64dec0d911a0becea67381f320072f8bedce8
-  data.tar.gz: ed81fe1fd2d8431bf4013fdb782acc3c69cf35e05686b2e78bd66cd51226f302e43605a4aa2a5a5439f4a649223bfb7e0f837f5cce9ab6684dfc04a48b397bf3
+  metadata.gz: e864e6c20b78d8e6c181a52cd1b1d6daa0d5dd12df50a44422f6757f7be5d54df4598764d6dab9a3adf9ec49c22b8a22181f67fe1a4e71881a3c97e683b8845c
+  data.tar.gz: 2044c39043b71feb3a41239ac802bcdd21c73a9b100c1f02180a84b067047cd1644c9f1834fa91c42e2244afc0719a57c94a0cb0cd1843132d98949cd69a7935

data/.github/dependabot.yml

@@ -0,0 +1,8 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "02:00"
+  open-pull-requests-limit: 10

data/.github/workflows/test.yml

@@ -0,0 +1,17 @@
+name: Tests
+on: [push]
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest]
+        ruby: ["3.0", "3.1", "3.2"]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - run: bundle exec rake

data/.gitignore

@@ -1,3 +1,4 @@
 pkg/*
 *.gem
 .bundle
+Gemfile.lock

data/CHANGELOG.md

@@ -0,0 +1,9 @@
+# Changelog
+
+## 0.2.0 (2023-08-29)
+
+Start of this document.
+
+### Changed:
+
+- Use ActiveSupport::Concern instead of locals

data/Gemfile

@@ -1,2 +1,2 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 gemspec

data/Rakefile

@@ -1,9 +1,11 @@
-require 'bundler'
+require "bundler"
+
 Bundler::GemHelper.install_tasks
 
-require 'rspec/core/rake_task'
+require "rspec/core/rake_task"
+
 RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
+  spec.pattern = "spec/**/*_spec.rb"
 end
-task :default => :spec
 
+task(:default => :spec)

data/lib/render_with_view/rspec_matcher.rb

@@ -1,12 +1,12 @@
-RSpec::Matchers.define :set_view_local do |key, expected = nil|
+RSpec::Matchers.define(:set_view_local) do |key, expected = nil|
   match do |block|
     block.call if block && block.is_a?(Proc)
 
-    value = assigns('__view__').send(key.to_sym) rescue nil
+    value = assigns("__view__").send(key.to_sym) rescue nil
 
     return !!value unless expected
 
-    expect(expected).to eq(value)
+    expect(expected).to(eq(value))
   end
 
   supports_block_expectations

data/lib/render_with_view/version.rb

@@ -1,3 +1,3 @@
 module RenderWithView
-  VERSION = '0.1.2'
+  VERSION = "0.2.0"
 end

data/lib/render_with_view.rb

@@ -1,26 +1,36 @@
-require 'render_with_view/version'
-require 'render_with_view/half_open_struct'
+require "active_support/concern"
+require "render_with_view/version"
+require "render_with_view/half_open_struct"
 
 module RenderWithView
-  class View < HalfOpenStruct; end
-
-  def self.included kls
-    kls.class_eval do
-      def render_with_view *args
-        if !args.first.is_a?(Hash)
-          tmpl = args.shift
-        else
-          tmpl = action_name
-        end
-        locals = args.shift
-        opts = args.shift || {}
-
-        # save to ivar for testing purposes
-        @__view__ = View.new(locals)
-
-        render tmpl, opts.merge(locals: { view: @__view__ })
+  extend ActiveSupport::Concern
+
+  class View < HalfOpenStruct
+  end
+
+  included do
+    helper_method :view
+
+    def view
+      raise ViewNotDefinedError, "View not defined" if !@__view__
+
+      @__view__
+    end
+
+    def render_with_view(*args)
+      if !args.first.is_a?(Hash)
+        tmpl = args.shift
+      else
+        tmpl = action_name
       end
+
+      view = args.shift
+      opts = args.shift || {}
+
+      # save to ivar for testing purposes
+      @__view__ = View.new(view)
+
+      render(tmpl, opts)
     end
   end
 end
-

data/render_with_view.gemspec

@@ -2,15 +2,18 @@
 require File.expand_path("../lib/render_with_view/version", __FILE__)
 
 Gem::Specification.new do |s|
-  s.name = 'render_with_view'
-  s.summary = 'Be explicit about what you send to your Rails views'
+  s.name = "render_with_view"
+  s.summary = "Be explicit about what you send to your Rails views"
   s.version = RenderWithView::VERSION
   s.platform = Gem::Platform::RUBY
-  s.authors = ['Mikkel Malmberg']
-  s.email = ['mikkel@brnbw.com']
-  s.homepage = 'https://github.com/mikker/render_with_view'
-  s.license = 'MIT'
+  s.authors = ["Mikkel Malmberg"]
+  s.email = ["mikkel@brnbw.com"]
+  s.homepage = "https://github.com/mikker/render_with_view"
+  s.license = "MIT"
+
+  s.add_dependency("rails")
+  s.add_development_dependency("rspec")
 
   s.files = `git ls-files`.split("\n")
-  s.require_path    = "lib"
+  s.require_path = "lib"
 end

data/spec/render_with_view/half_open_struct_spec.rb

@@ -1,13 +1,13 @@
-require 'spec_helper'
+require "spec_helper"
 
 module RenderWithView
   RSpec.describe HalfOpenStruct do
     it "can be initialized with a hash, and values read and written" do
       s = HalfOpenStruct.new(name: "Joe")
-      expect(s.name).to eq "Joe"
+      expect(s.name).to eq("Joe")
 
       s.age = 42
-      expect(s.age).to eq 42
+      expect(s.age).to eq(42)
     end
 
     it "raises trying to read an unknown value" do
@@ -16,7 +16,7 @@ module RenderWithView
       expect { s.age }.to raise_error("Unknown key: age")
 
       s.age = 42
-      expect(s.age).to eq 42
+      expect(s.age).to eq(42)
     end
 
     it "raises for unknown methods" do
@@ -28,18 +28,18 @@ module RenderWithView
     # Considered an API like "s.age?" but that's ambiguous with undefined vs. falsy values.
     it "lets you query for values being defined" do
       s = HalfOpenStruct.new
-      expect(s.include?(:age)).to be false
+      expect(s.include?(:age)).to be(false)
 
       s.age = 42
-      expect(s.include?(:age)).to be true
+      expect(s.include?(:age)).to be(true)
     end
 
     it "lets you fetch values with a fallback" do
       s = HalfOpenStruct.new
-      expect(s.fetch(:age, :fallback)).to eq :fallback
+      expect(s.fetch(:age, :fallback)).to eq(:fallback)
 
       s.age = 42
-      expect(s.fetch(:age, :fallback)).to eq 42
+      expect(s.fetch(:age, :fallback)).to eq(42)
     end
   end
 end

data/spec/render_with_view/rspec_matcher_spec.rb

@@ -1,21 +1,21 @@
-require 'spec_helper'
-require 'render_with_view/rspec_matcher'
+require "spec_helper"
+require "render_with_view/rspec_matcher"
 
-RSpec.describe 'RSpec matcher' do
+RSpec.describe "RSpec matcher" do
   let(:ctrl) { FakeController.new }
-  subject { ctrl.render_with_view :index, thing: 1 }
+  subject { ctrl.render_with_view(:index, thing: 1) }
 
   # short form
-  it { should set_view_local :thing }
-  it { should_not set_view_local :other_thing }
+  it { should(set_view_local(:thing)) }
+  it { should_not(set_view_local(:other_thing)) }
 
   # long form
   it "takes and matches arguments" do
-    expect(subject).to set_view_local(:thing, 1)
-    expect(subject).to_not set_view_local(:thing, 2)
+    expect(subject).to(set_view_local(:thing, 1))
+    expect(subject).to_not(set_view_local(:thing, 2))
   end
 
-  def assigns key
+  def assigns(key)
     ctrl.instance_variable_get("@#{key}".to_sym)
   end
 end

data/spec/render_with_view_spec.rb

@@ -1,50 +1,48 @@
-require 'spec_helper'
+require "spec_helper"
 
 RSpec.describe RenderWithView do
 
   describe "#render_with_view" do
     it "calls render with template and assigned view" do
-      user = { id: 1 }
+      user = {id: 1}
       ctrl = FakeController.new
 
-      ctrl.render_with_view :index, user: user
+      ctrl.render_with_view(:index, user: user)
 
       tmpl, args = ctrl.calls.last
-      expect(tmpl).to eq :index
-      expect(args[:locals][:view].user).to eq(user)
+      expect(tmpl).to(eq(:index))
     end
 
     it "defaults to action_name template" do
-      user = { id: 1 }
+      user = {id: 1}
       ctrl = FakeController.new
 
-      ctrl.render_with_view user: user
+      ctrl.render_with_view(user: user)
 
       tmpl, * = ctrl.calls.last
-      expect(tmpl).to eq :new
+      expect(tmpl).to(eq(:new))
     end
 
     it "saves to an instance var behind the scenes" do
-      user = { id: 1 }
+      user = {id: 1}
       ctrl = FakeController.new
 
-      ctrl.render_with_view :index, user: user
+      ctrl.render_with_view(:index, user: user)
 
       ivar = ctrl.instance_variable_get(:@__view__)
-      expect(ivar).to be_a RenderWithView::View
-      expect(ivar.user).to eq user
+      expect(ivar).to(be_a(RenderWithView::View))
+      expect(ivar.user).to(eq(user))
     end
 
     it "includes options" do
-      user = { id: 1 }
-      opts = { flash: {notice: "YAS!"} }
+      user = {id: 1}
+      opts = {status: 401}
       ctrl = FakeController.new
 
       ctrl.render_with_view(:edit, {user: user}, opts)
       tmpl, opts = ctrl.calls.last
-      expect(tmpl).to eq :edit
-      expect(opts[:flash]).to eq({notice: "YAS!"})
+      expect(tmpl).to(eq(:edit))
+      expect(opts[:status]).to(eq(401))
     end
   end
-
 end

data/spec/spec_helper.rb

@@ -1,7 +1,10 @@
-require 'rspec/core'
-require 'render_with_view'
+require "rspec/core"
+require "render_with_view"
 
 class FakeController
+  def self.helper_method(*args)
+  end
+
   include RenderWithView
 
   attr_reader :calls

metadata

@@ -1,23 +1,54 @@
 --- !ruby/object:Gem::Specification
 name: render_with_view
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Mikkel Malmberg
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-10-15 00:00:00.000000000 Z
-dependencies: []
-description: 
+date: 2023-08-29 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  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:
 - mikkel@brnbw.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -35,7 +66,7 @@ homepage: https://github.com/mikker/render_with_view
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -50,9 +81,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.4.19
+signing_key:
 specification_version: 4
 summary: Be explicit about what you send to your Rails views
 test_files: []