tzispa 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aeeebb53345493217e8618fff6441a3c210b2f75
-  data.tar.gz: 958177f65207aac9c74e28fcfbdff7fe83609c61
+  metadata.gz: 5c89e8ec7f20be6d2513d85e5951f8040efdfb1e
+  data.tar.gz: aadaaee55360b82fd09d644c0e48eb3ef76d03bb
 SHA512:
-  metadata.gz: 7c7f074552fd252f829f163e9ef49572a7f99340c31a344c05fe60c4e27ae51f725e91d8c6b3d4f267bc9ce631a393051a964a2195463e56757241f94d4f490c
-  data.tar.gz: 1fff97eec6fae0213afc1768baa7e9d0df5c21b4a24ac67c227191d9f614854e8fafc382a36bfc5870371311caf58bd46f60045af6a277fe674c544575d3e18a
+  metadata.gz: ee05ed3e7c10f7eda755d9564838cf8024c830a44e29381307674ff11e595c437cac4a1fbb1b527efce8ad30ae0cb8de780260a4a27c520c3c8e193928094e0e
+  data.tar.gz: 89dbc1f7e155605d2194b9302711040663186fdf738cd1463b8f1226a1c92c51198353ce734aa29872b27e6db85eb7dae6b9ebfd8e165a1f7b0ecc0d24030aa1

data/CHANGELOG.md

@@ -2,6 +2,11 @@ Tzispa
 
 General purpose web framework
 
+## v0.4.6
+- add browser detection support
+- allow specify a url fragment to redirect to the referer page section
+- middleware management fixes
+
 ## v0.4.5
 - remove _load_assets_middleware
 - add browser detection capability

data/lib/tzispa/app.rb

@@ -16,7 +16,7 @@ module Tzispa
 
   ENV_TZISPA_APP     = :tzispa__app
   ENV_TZISPA_CONTEXT = :tzispa__context
-  
+
 
   class Application
     extend Forwardable
@@ -81,13 +81,14 @@ module Tzispa
       unless @loaded
         Mutex.new.synchronize {
           load_locales
-          @middleware.load!
           @repository = Data::Repository.new(@config.repository.to_h).load! if @config.respond_to? :repository
           @engine = Rig::Engine.new(self, @config.template_cache.enabled, @config.template_cache.size)
           @logger = Logger.new("logs/#{@domain.name}.log", 'weekly')
           @logger.level = @config.respond_to?(:developing) && @config.developing ? Logger::DEBUG : Logger::INFO
           @domain.require_dir 'helpers'
           @domain.require_dir 'api'
+          @domain.require_dir 'middleware'
+          @middleware.load!
           @loaded = true
         }
       end

data/lib/tzispa/controller/api.rb

@@ -30,7 +30,11 @@ module Tzispa
 
       def redirect
         context.flash << hnd.message
-        url = hnd.data || request.referer
+        url = if hnd.data
+          hnd.data.start_with?('#') ? "#{request.referer}#{hnd.data}" : hnd.data
+        else
+          request.referer
+        end
         context.redirect url, response
       end
 
@@ -42,10 +46,14 @@ module Tzispa
       end
 
       def json
-        data = hnd.data.is_a?(::Hash) ? hnd.data : JSON.parse(hnd.data)
-        data[:__result_status] = hnd.status
-        data[:__result_message] = hnd.message
-        response.body << data.to_json.to_s
+        if hnd.data.is_a?(::Hash)
+          data = hnd.data
+          data[:__result_status] = hnd.status
+          data[:__result_message] = hnd.message
+        else
+          data = JSON.parse(hnd.data)
+        end
+        response.body << data.to_json
         content_type :json
         set_action_headers
       end

data/lib/tzispa/http/context.rb

@@ -16,7 +16,7 @@ module Tzispa
       include Tzispa::Helpers::Security
 
       attr_reader    :request, :response
-      def_delegators :@request, :session
+      def_delegators :@request, :session, :browser
 
       SESSION_LAST_ACCESS   = :__last_access
       SESSION_AUTH_USER     = :__auth__user

data/lib/tzispa/http/request.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rack'
+require 'browser'
 
 module Tzispa
   module Http
@@ -8,6 +9,13 @@ module Tzispa
 
         alias secure? ssl?
 
+        attr_reader :browser
+
+        def initialize(env)
+          super(env)
+          @browser = Browser.new user_agent, accept_language: env["HTTP_ACCEPT_LANGUAGE"]
+        end
+
         def forwarded?
           @env.include? "HTTP_X_FORWARDED_HOST"
         end

data/lib/tzispa/middleware.rb

@@ -40,7 +40,7 @@ module Tzispa
     def load_middleware(middleware)
       case middleware
       when String
-        @application.domain.const_get(middleware)
+        Object.const_get(middleware)
       else
         middleware
       end

data/lib/tzispa/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Tzispa
-  VERSION = '0.4.5'
+  VERSION = '0.4.6'
   FRAMEWORK_NAME = 'Tzispa'
   GEM_NAME = 'tzispa'
 end

data/tzispa.gemspec

@@ -20,9 +20,10 @@ Gem::Specification.new do |s|
   s.add_dependency 'i18n',           '~> 0.7.0'
   s.add_dependency 'http_router',    '~> 0.11.2'
   s.add_dependency 'moneta',         '~> 0.8.0'
-  s.add_dependency 'tzispa_helpers', '~> 0.1.0'
-  s.add_dependency 'tzispa_utils',   '~> 0.2.1'
-  s.add_dependency 'tzispa_rig',     '~> 0.2.7'
+  s.add_dependency 'browser',        '~> 2.1'
+  s.add_dependency 'tzispa_helpers', '~> 0.1'
+  s.add_dependency 'tzispa_utils',   '~> 0.2'
+  s.add_dependency 'tzispa_rig',     '~> 0.3'
   s.add_dependency 'tzispa_data',    '~> 0.1.1'
 
   s.files         = Dir.glob("{lib,bin}/**/*") + %w(README.md CHANGELOG.md LICENSE tzispa.gemspec)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tzispa
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Juan Antonio Piñero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-04 00:00:00.000000000 Z
+date: 2016-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -80,48 +80,62 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.0
+- !ruby/object:Gem::Dependency
+  name: browser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: tzispa_helpers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: tzispa_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: tzispa_rig
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.7
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.7
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: tzispa_data
   requirement: !ruby/object:Gem::Requirement
@@ -151,7 +165,6 @@ files:
 - lib/tzispa.rb
 - lib/tzispa/api/handler.rb
 - lib/tzispa/app.rb
-- lib/tzispa/autoreload.rb
 - lib/tzispa/bin/tzispa
 - lib/tzispa/cli.rb
 - lib/tzispa/command/api.rb

data/lib/tzispa/autoreload.rb

@@ -1,110 +0,0 @@
-# This file extends the Kernel's require function and adds the 
-# AutoReload module which allows to reload files once they have changed
-# on the disk.
-#
-# Basically, you just require your files as usual, and if you want to update
-# the files, either call AutoReload.reload(file) or AutoReload.reload_all.
-#
-# Usage:
-#   irb -rautoload
-#
-# Then type 'reload' on the prompt to reload require'd files which have
-# changed in the meantime.
-#
-# Written by Mikio L. Braun, March 16, 2008, edited Jan 15, 2010
-
-require 'pp'
-require 'set'
-
-# This module tracks loaded files and their timestamps and allows to reload
-# files which have changed automatically by calling reload.
-module AutoReload
-  # stores the normalized filenames and their File.mtime timestamps
-  @timestamps = Hash.new
-  @notfound = Set.new
-  @verbose = false
-  
-  def self.verbose=(flag)
-    @verbose = flag
-  end
-  
-  # find the full path to a file
-  def self.locate(file)
-    return nil if @notfound.include? file
-    $:.each do |dir|
-      fullpath = File.join(dir, file)
-      if File.exists? fullpath
-        return fullpath
-      elsif File.exists?(fullpath + '.rb')
-        return fullpath + '.rb'
-      elsif File.exists?(fullpath + '.so')
-        return fullpath + '.so'
-      end
-    end
-    # puts "[AutoReload] File #{file} not found!"
-    @notfound.add file
-    return nil
-  end
-  
-  # store the time stamp of a file
-  def self.timestamp(file)
-    path = locate(file)
-    if path
-      file = normalize(path, file)
-      @timestamps[file] = File.mtime(path)
-    end
-  end
-  
-  # put the extension on a filename
-  def self.normalize(path, file)
-    if File.extname(file) == ""
-      return file + File.extname(path)
-    else
-      return file
-    end
-  end
-  
-  # show all stored files and their timestamp
-  def self.dump
-    pp @timestamps
-  end
-  
-  # reload a file
-  def self.reload(file, force=false)
-    path = locate(file)
-    file = normalize(path, file)
-    
-    if force or (path and File.mtime(path) > @timestamps[file])
-      puts "[AutoReload] reloading #{file}" if @verbose
-      
-      # delete file from list of loaded modules, and reload
-      $".delete file
-      require file
-      return true
-    else
-      return false
-    end
-  end
-  
-  # reload all files which were required
-  def self.reload_all(force=false)
-    @timestamps.each_key do |file|
-      self.reload(file, force)
-    end
-  end
-end
-
-# Overwrite 'require' to register the time stamps instead.
-module Kernel # :nodoc:
-  alias old_require require
-  
-  def require(file)
-    AutoReload.timestamp(file)
-    old_require(file)
-  end
-
-  def reload
-    AutoReload.reload_all
-    return
-  end
-end