rails_current 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 186f701535b7d65d21e71f7d1598a7caeb17f946
-  data.tar.gz: 6e51dc1f716e488da848212f0b107728f22b63f5
+SHA256:
+  metadata.gz: dd096f5c6ef3f51bb7c82d1f66ba813955d641d3781dcffaab6c1ad8dbb7d5b5
+  data.tar.gz: 2d61359d45c4496c30ce0ec87c7f5a5fda1e170003af08e26853b5cb1ff10de5
 SHA512:
-  metadata.gz: 9482a45d120991b3380422c515769a286f049d362fcab55561fcd9aea8bd40188d740235fa7eb2dc9f09d61bfa6d260eca583df46342b87284d53c11c165d507
-  data.tar.gz: af54cc69dbf1b94c2e71905ae5e802964b8cf3041f982d051e95c36691bb83db2b720be749b417742548a0a47bf411b2c44422061752dbf02aca947532a42dcb
+  metadata.gz: 1d7211d22661a811d1cfffa16b39333a8ceee0d235372c927804cb8c2a6137fc2b4ebc9a8a1fc80f501ee836bce58f5ccef3a96a3fbeb90ad7ec30acbc96e8bf
+  data.tar.gz: 3707b6e19d80cbca2b9b701cfc01cde7ba1e8d9524229f40a9388f3c39116e9d69dcd4b5c9d2227d1fd4a68eece6677999287f3f6b911f7524b61c99301365fe

data/README.md

@@ -54,6 +54,7 @@ gem install rails_current
 
 
 gem 'rails-current', :require => 'current'
+
 bundle install
 ```
 

data/Rakefile

@@ -1,18 +1,393 @@
-# vim: syntax=ruby
-load 'tasks/this.rb'
+#This.rubyforge_project = 'codeforpeople'
+This.author = "Ara T. Howard"
+This.email = "ara.t.howard@gmail.com"
+This.homepage = "https://github.com/ahoward/#{ This.lib }"
 
-This.name     = "rails_current"
-This.author   = "Ara T. Howard"
-This.email    = "ara.t.howard@gmail.com"
-This.homepage = "https://github.com/ahoward/#{ This.name }"
+task :license do
+  open('LICENSE', 'w'){|fd| fd.puts "Ruby"}
+end
+
+task :default do
+  puts((Rake::Task.tasks.map{|task| task.name.gsub(/::/,':')} - ['default']).sort)
+end
+
+task :test do
+  run_tests!
+end
+
+namespace :test do
+  task(:unit){ run_tests!(:unit) }
+  task(:functional){ run_tests!(:functional) }
+  task(:integration){ run_tests!(:integration) }
+end
+
+def run_tests!(which = nil)
+  which ||= '**'
+  test_dir = File.join(This.dir, "test")
+  test_glob ||= File.join(test_dir, "#{ which }/**_test.rb")
+  test_rbs = Dir.glob(test_glob).sort
+        
+  div = ('=' * 119)
+  line = ('-' * 119)
+
+  test_rbs.each_with_index do |test_rb, index|
+    testno = index + 1
+    command = "#{ This.ruby } -w -I ./lib -I ./test/lib #{ test_rb }"
+
+    puts
+    say(div, :color => :cyan, :bold => true)
+    say("@#{ testno } => ", :bold => true, :method => :print)
+    say(command, :color => :cyan, :bold => true)
+    say(line, :color => :cyan, :bold => true)
+
+    system(command)
+
+    say(line, :color => :cyan, :bold => true)
+
+    status = $?.exitstatus
+
+    if status.zero? 
+      say("@#{ testno } <= ", :bold => true, :color => :white, :method => :print)
+      say("SUCCESS", :color => :green, :bold => true)
+    else
+      say("@#{ testno } <= ", :bold => true, :color => :white, :method => :print)
+      say("FAILURE", :color => :red, :bold => true)
+    end
+    say(line, :color => :cyan, :bold => true)
+
+    exit(status) unless status.zero?
+  end
+end
+
+
+task :gemspec do
+  ignore_extensions = ['git', 'svn', 'tmp', /sw./, 'bak', 'gem']
+  ignore_directories = ['pkg']
+  ignore_files = ['test/log']
+
+  shiteless = 
+    lambda do |list|
+      list.delete_if do |entry|
+        next unless test(?e, entry)
+        extension = File.basename(entry).split(%r/[.]/).last
+        ignore_extensions.any?{|ext| ext === extension}
+      end
+      list.delete_if do |entry|
+        next unless test(?d, entry)
+        dirname = File.expand_path(entry)
+        ignore_directories.any?{|dir| File.expand_path(dir) == dirname}
+      end
+      list.delete_if do |entry|
+        next unless test(?f, entry)
+        filename = File.expand_path(entry)
+        ignore_files.any?{|file| File.expand_path(file) == filename}
+      end
+    end
+
+  lib         = This.lib
+  object      = This.object
+  version     = This.version
+  files       = shiteless[Dir::glob("**/**")]
+  executables = shiteless[Dir::glob("bin/*")].map{|exe| File.basename(exe)}
+  #has_rdoc    = true #File.exist?('doc')
+  test_files  = "test/#{ lib }.rb" if File.file?("test/#{ lib }.rb")
+  summary     = object.respond_to?(:summary) ? object.summary : "summary: #{ lib } kicks the ass"
+  description = object.respond_to?(:description) ? object.description : "description: #{ lib } kicks the ass"
+  license     = object.respond_to?(:license) ? object.license : "Ruby"
+
+  if This.extensions.nil?
+    This.extensions = []
+    extensions = This.extensions
+    %w( Makefile configure extconf.rb ).each do |ext|
+      extensions << ext if File.exists?(ext)
+    end
+  end
+  extensions = [extensions].flatten.compact
+
+  if This.dependencies.nil?
+    dependencies = []
+  else
+    case This.dependencies
+      when Hash
+        dependencies = This.dependencies.values
+      when Array
+        dependencies = This.dependencies
+    end
+  end
+
+  template = 
+    if test(?e, 'gemspec.erb')
+      Template{ IO.read('gemspec.erb') }
+    else
+      Template {
+        <<-__
+          ## <%= lib %>.gemspec
+          #
+
+          Gem::Specification::new do |spec|
+            spec.name = <%= lib.inspect %>
+            spec.version = <%= version.inspect %>
+            spec.platform = Gem::Platform::RUBY
+            spec.summary = <%= lib.inspect %>
+            spec.description = <%= description.inspect %>
+            spec.license = <%= license.inspect %>
+
+            spec.files =\n<%= files.sort.pretty_inspect %>
+            spec.executables = <%= executables.inspect %>
+            
+            spec.require_path = "lib"
+
+            spec.test_files = <%= test_files.inspect %>
+
+            <% dependencies.each do |lib_version| %>
+              spec.add_dependency(*<%= Array(lib_version).flatten.inspect %>)
+            <% end %>
+
+            spec.extensions.push(*<%= extensions.inspect %>)
+
+            spec.author = <%= This.author.inspect %>
+            spec.email = <%= This.email.inspect %>
+            spec.homepage = <%= This.homepage.inspect %>
+          end
+        __
+      }
+    end
+
+  Fu.mkdir_p(This.pkgdir)
+  gemspec = "#{ lib }.gemspec"
+  open(gemspec, "w"){|fd| fd.puts(template)}
+  This.gemspec = gemspec
+end
+
+task :gem => [:clean, :gemspec] do
+  Fu.mkdir_p(This.pkgdir)
+  before = Dir['*.gem']
+  cmd = "gem build #{ This.gemspec }"
+  `#{ cmd }`
+  after = Dir['*.gem']
+  gem = ((after - before).first || after.first) or abort('no gem!')
+  Fu.mv(gem, This.pkgdir)
+  This.gem = File.join(This.pkgdir, File.basename(gem))
+end
+
+task :readme do
+  samples = ''
+  prompt = '~ > '
+  lib = This.lib
+  version = This.version
+
+  Dir['sample*/*'].sort.each do |sample|
+    samples << "\n" << "  <========< #{ sample } >========>" << "\n\n"
 
-This.ruby_gemspec do |spec|
-  spec.add_dependency( 'map', '~> 6.0')
+    cmd = "cat #{ sample }"
+    samples << Util.indent(prompt + cmd, 2) << "\n\n"
+    samples << Util.indent(`#{ cmd }`, 4) << "\n"
 
-  spec.add_development_dependency( 'rake'     , '~> 10.1')
-  spec.add_development_dependency( 'minitest' , '~> 5.0' )
+    cmd = "ruby #{ sample }"
+    samples << Util.indent(prompt + cmd, 2) << "\n\n"
 
-  spec.licenses = ['Ruby']
+    cmd = "ruby -e'STDOUT.sync=true; exec %(ruby -I ./lib #{ sample })'"
+    samples << Util.indent(`#{ cmd } 2>&1`, 4) << "\n"
+  end
+
+  template = 
+    if test(?e, 'README.erb')
+      Template{ IO.read('README.erb') }
+    else
+      Template {
+        <<-__
+          NAME
+            #{ lib }
+
+          DESCRIPTION
+
+          INSTALL
+            gem install #{ lib }
+
+          SAMPLES
+            #{ samples }
+        __
+      }
+    end
+
+  open("README", "w"){|fd| fd.puts template}
+end
+
+
+task :clean do
+  Dir[File.join(This.pkgdir, '**/**')].each{|entry| Fu.rm_rf(entry)}
+end
+
+
+task :release => [:clean, :gemspec, :gem] do
+  gems = Dir[File.join(This.pkgdir, '*.gem')].flatten
+  raise "which one? : #{ gems.inspect }" if gems.size > 1
+  raise "no gems?" if gems.size < 1
+
+  cmd = "gem push #{ This.gem }"
+  puts cmd
+  puts
+  system(cmd)
+  abort("cmd(#{ cmd }) failed with (#{ $?.inspect })") unless $?.exitstatus.zero?
+
+  cmd = "rubyforge login && rubyforge add_release #{ This.rubyforge_project } #{ This.lib } #{ This.version } #{ This.gem }"
+  puts cmd
+  puts
+  system(cmd)
+  abort("cmd(#{ cmd }) failed with (#{ $?.inspect })") unless $?.exitstatus.zero?
 end
 
-load 'tasks/default.rake'
+
+
+
+
+BEGIN {
+# support for this rakefile
+#
+  $VERBOSE = nil
+
+  require 'ostruct'
+  require 'erb'
+  require 'fileutils'
+  require 'rbconfig'
+  require 'pp'
+
+# fu shortcut
+#
+  Fu = FileUtils
+
+# cache a bunch of stuff about this rakefile/environment
+#
+  This = OpenStruct.new
+
+  This.file = File.expand_path(__FILE__)
+  This.dir = File.dirname(This.file)
+  This.pkgdir = File.join(This.dir, 'pkg')
+
+# grok lib
+#
+  lib = ENV['LIB']
+  unless lib
+    lib = File.basename(Dir.pwd).sub(/[-].*$/, '')
+  end
+  This.lib = lib
+
+# grok version
+#
+  version = ENV['VERSION']
+  unless version
+    require "./lib/#{ This.lib }"
+    This.name = lib.capitalize
+    This.object = eval(This.name)
+    version = This.object.send(:version)
+  end
+  This.version = version
+
+# see if dependencies are export by the module
+#
+  if This.object.respond_to?(:dependencies)
+    This.dependencies = This.object.dependencies
+  end
+
+# we need to know the name of the lib an it's version
+#
+  abort('no lib') unless This.lib
+  abort('no version') unless This.version
+
+# discover full path to this ruby executable
+#
+  c = RbConfig::CONFIG
+  bindir = c["bindir"] || c['BINDIR']
+  ruby_install_name = c['ruby_install_name'] || c['RUBY_INSTALL_NAME'] || 'ruby'
+  ruby_ext = c['EXEEXT'] || ''
+  ruby = File.join(bindir, (ruby_install_name + ruby_ext))
+  This.ruby = ruby
+
+# some utils
+#
+  module Util
+    def indent(s, n = 2)
+      s = unindent(s)
+      ws = ' ' * n
+      s.gsub(%r/^/, ws)
+    end
+
+    def unindent(s)
+      indent = nil
+      s.each_line do |line|
+      next if line =~ %r/^\s*$/
+      indent = line[%r/^\s*/] and break
+    end
+    indent ? s.gsub(%r/^#{ indent }/, "") : s
+  end
+    extend self
+  end
+
+# template support
+#
+  class Template
+    def initialize(&block)
+      @block = block
+      @template = block.call.to_s
+    end
+    def expand(b=nil)
+      ERB.new(Util.unindent(@template)).result((b||@block).binding)
+    end
+    alias_method 'to_s', 'expand'
+  end
+  def Template(*args, &block) Template.new(*args, &block) end
+
+# colored console output support
+#
+  This.ansi = {
+    :clear      => "\e[0m",
+    :reset      => "\e[0m",
+    :erase_line => "\e[K",
+    :erase_char => "\e[P",
+    :bold       => "\e[1m",
+    :dark       => "\e[2m",
+    :underline  => "\e[4m",
+    :underscore => "\e[4m",
+    :blink      => "\e[5m",
+    :reverse    => "\e[7m",
+    :concealed  => "\e[8m",
+    :black      => "\e[30m",
+    :red        => "\e[31m",
+    :green      => "\e[32m",
+    :yellow     => "\e[33m",
+    :blue       => "\e[34m",
+    :magenta    => "\e[35m",
+    :cyan       => "\e[36m",
+    :white      => "\e[37m",
+    :on_black   => "\e[40m",
+    :on_red     => "\e[41m",
+    :on_green   => "\e[42m",
+    :on_yellow  => "\e[43m",
+    :on_blue    => "\e[44m",
+    :on_magenta => "\e[45m",
+    :on_cyan    => "\e[46m",
+    :on_white   => "\e[47m"
+  }
+  def say(phrase, *args)
+    options = args.last.is_a?(Hash) ? args.pop : {}
+    options[:color] = args.shift.to_s.to_sym unless args.empty?
+    keys = options.keys
+    keys.each{|key| options[key.to_s.to_sym] = options.delete(key)}
+
+    color = options[:color]
+    bold = options.has_key?(:bold)
+
+    parts = [phrase]
+    parts.unshift(This.ansi[color]) if color
+    parts.unshift(This.ansi[:bold]) if bold
+    parts.push(This.ansi[:clear]) if parts.size > 1
+
+    method = options[:method] || :puts
+
+    Kernel.send(method, parts.join)
+  end
+
+# always run out of the project dir
+#
+  Dir.chdir(This.dir)
+}

data/lib/rails_current.rb

@@ -1,14 +1,15 @@
 # -*- encoding : utf-8 -*-
 
 module Current
-  VERSION = '2.1.0'
+  VERSION = '2.2.0'
+
   def Current.version
     VERSION
   end
 
   def Current.dependencies
     {
-      'map'           => [ 'map'           , ' >= 6.0.1' ]
+      'map' => [ 'map', ' ~> 6.0' ]
     }
   end
 
@@ -172,8 +173,8 @@ module Current
       controller.perform_caching = true
       controller.cache_store = store
 
-      request = ActionDispatch::TestRequest.create({})
-      response = ActionDispatch::TestResponse.create({})
+      request = ActionDispatch::TestRequest.create
+      response = ActionDispatch::TestResponse.create
 
       controller.request = request
       controller.response = response
@@ -245,10 +246,6 @@ module Current
   end
 end
 
-def Current(*args, &block)
-  Current.attribute(*args, &block)
-end
-
 if defined?(Rails)
 
 ##
@@ -301,3 +298,4 @@ BEGIN {
   Object.send(:remove_const, :Current) if defined?(::Current)
   Object.send(:remove_const, :Rails_current) if defined?(::Rails_current)
 }
+

data/rails_current.gemspec

@@ -0,0 +1,40 @@
+## rails_current.gemspec
+#
+
+Gem::Specification::new do |spec|
+  spec.name = "rails_current"
+  spec.version = "2.2.0"
+  spec.platform = Gem::Platform::RUBY
+  spec.summary = "rails_current"
+  spec.description = "track 'current_user' et all in a tidy, global, and thread-safe fashion for your rails apps"
+  spec.license = "Ruby"
+
+  spec.files =
+["README.md",
+ "Rakefile",
+ "lib",
+ "lib/rails_current.rb",
+ "rails_current.gemspec",
+ "tasks",
+ "tasks/default.rake",
+ "tasks/this.rb",
+ "test",
+ "test/rails_current_test.rb",
+ "test/testing.rb"]
+
+  spec.executables = []
+  
+  spec.require_path = "lib"
+
+  spec.test_files = nil
+
+  
+    spec.add_dependency(*["map", " ~> 6.0"])
+  
+
+  spec.extensions.push(*[])
+
+  spec.author = "Ara T. Howard"
+  spec.email = "ara.t.howard@gmail.com"
+  spec.homepage = "https://github.com/ahoward/rails_current"
+end

data/tasks/this.rb

@@ -135,8 +135,8 @@ class ThisProject
       spec.email       = email
       spec.homepage    = homepage
 
-      spec.summary     = summary
-      spec.description = description
+      spec.summary     = summary 
+      spec.description = description == summary ? "#{ description} " : description
       spec.license     = license
 
       spec.files       = manifest

data/test/rails_current_test.rb

@@ -1,6 +1,4 @@
-require 'testing'
-
-Testing Current do
+Testing.test Current do
 
 ##
 #
@@ -197,6 +195,10 @@ Testing Current do
 private
   def mock_rails!
     Object.module_eval <<-__
+      remove_const :Rails if const_defined? :Rails
+      remove_const :ActionController if const_defined? :ActionController
+      remove_const :ActionView if const_defined? :ActionView
+
       module Rails
       end
 

data/test/testing.rb

@@ -2,7 +2,11 @@
 gem 'minitest'
 require 'minitest/autorun'
 require 'minitest/pride'
-require 'rails_current'
+
+
+if defined?(Testing)
+  Object.send(:remove_const, :Testing)
+end
 
 class Testing
   class Slug < ::String
@@ -28,7 +32,7 @@ class Testing
   end
 end
 
-def Testing(*args, &block)
+def Testing.test(*args, &block)
   Class.new(::Minitest::Test) do
 
   ## class methods

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_current
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Ara T. Howard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-01 00:00:00.000000000 Z
+date: 2020-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: map
@@ -24,46 +24,17 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.1'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-description: track `current_user` et all in a tidy, global, and thread-safe fashion.
+description: track 'current_user' et all in a tidy, global, and thread-safe fashion
+  for your rails apps
 email: ara.t.howard@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- Manifest.txt
-- README.md
+extra_rdoc_files: []
 files:
-- Manifest.txt
 - README.md
 - Rakefile
 - lib/rails_current.rb
+- rails_current.gemspec
 - tasks/default.rake
 - tasks/this.rb
 - test/rails_current_test.rb
@@ -73,27 +44,22 @@ licenses:
 - Ruby
 metadata: {}
 post_install_message: 
-rdoc_options:
-- "--main"
-- README.md
-- "--markup"
-- tomdoc
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: track `current_user` et all in a tidy, global, and thread-safe fashion.
+summary: rails_current
 test_files: []

data/Manifest.txt

@@ -1,8 +0,0 @@
-Manifest.txt
-README.md
-Rakefile
-lib/rails_current.rb
-tasks/default.rake
-tasks/this.rb
-test/rails_current_test.rb
-test/testing.rb