lux-fw 0.5.36 → 0.5.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f88cd45d785eba48eb2321f58d7d6c5e8748339a6dffef24181be783724fed5c
-  data.tar.gz: 368139721b7d25d90839e1b9d948130134c9b6f2bed642a10d75a8e81ba1ed1e
+  metadata.gz: 4eabd8ade1e698ed7f377a9d0e14f819b72be8847f403c1b380ebf4997994716
+  data.tar.gz: 5b2092385c1fae7b70ddfebe2efd4b0c97a3e03a3baec4bdb260156941c7e13d
 SHA512:
-  metadata.gz: f38a00ea2a8d43814645f05dd4e59d39d81b6bff5ac29542ae1c41dbb7082f04a050e33d667c9d7a3a09dba285bd0786e7784869595f6ab340cb1bbb96558bde
-  data.tar.gz: 381f478c2e06dd5123f04764b8515b4f8f6e4e438a222c7f89e6e8b5e05cb58952424640c19e2b1d14b2570f7fb646646b4820469e845b9631a526b226cc80e0
+  metadata.gz: a3e77f76261c629cff38cac6740968dd8c30acd620f4a5dd0370c1c0d3c4cdda8453586c67ab0bafae1205a7e22907db7b771af268009f9f401c656c454fc488
+  data.tar.gz: e71564c624c06c921da14ba3ac53a0a904ad1343af90c5bddcfa9fce06845fa1feb91a55964265dbe5514bfa7f63e3d6a8ccda9c68aec7e51aef2a973662e0b3

data/.version

@@ -1 +1 @@
-0.5.36
+0.5.37

data/bin/build_gem

@@ -75,3 +75,5 @@ File.write './README.md', out
 `rm -rf misc/demo/tmp`
 `rm -rf misc/demo/Gemfile.lock`
 `rm -rf misc/demo/package.json`
+
+puts 'lux-fw Readme, demo build'

data/bin/cli/routes.rb

@@ -43,13 +43,14 @@ LuxCli.class_eval do
         route = '/%s' % route unless route.include?('/')
         route += '/*' unless target.include?('#')
         route = "#{@prefix}/*" if route .include?('#')
+
         print "#{indent}#{route}".ljust(50)
         print target.ljust(50)
 
         if controller && !target.include?('#')
           puts
           for el in controller.instance_methods(false)
-            print "  #{route.to_s.sub('/*', '/')}#{el}".ljust(50)
+            print "  #{route.to_s.sub('/*', '/').gsub('//', '/')}#{el}".ljust(50)
             puts [target, el].join(' # ')
           end
         else
@@ -61,6 +62,8 @@ LuxCli.class_eval do
         if @target
           target = @target.is_a?(String) && !@target.include?('#') ? @target + "##{obj}" : @target
           show_route obj, target
+        elsif obj.is_a?(Array)
+          show_route obj[0], obj[1]
         elsif obj.is_a?(Hash)
           show_route obj.keys.first, obj.values.first
         elsif block_given?

data/lib/README.md

@@ -25,6 +25,6 @@ Start the app
 
 Look at the generated code and play with it.
 
-## Lux components
+
 
 

data/lib/lux/README.md

@@ -1,6 +1,6 @@
-# Page render flow
+## Page render flow
 
-## Example config ru
+### Example config.ru
 ```
 $lux_start_time = Time.now
 require './config/application'

data/lib/lux/application/README.md

@@ -65,7 +65,7 @@ Lux.app do
 
   ###
 
-  routes do
+  routes do |r|
     # we show on root method, that target can be multiple object types, 5 variants
     root [RootController, :index] # calls RootController#index
     root 'root#call'              # calls RootController#call
@@ -76,7 +76,12 @@ Lux.app do
     # we can route based on the user status
     root User.current ? 'main/root' : 'guest'
 
+    # simple route
+    r.about 'static#about'
+
     # map "/api" to "api_router" method
+    r.api :api_router
+    # or
     map api: :api_router
 
     # with MainController

data/lib/lux/application/application.rb

@@ -4,19 +4,20 @@
 
 class Lux::Application
   class_callback :config    # pre boot app config
-  class_callback :web_boot  # rack_handler is passed as argument
+  class_callback :rack_boot  # rack_handler is passed as argument
   class_callback :info      # called by "lux config" cli
   class_callback :before    # before any page load
   class_callback :routes    # routes resolve
   class_callback :after     # after any page load
 
-  web_boot do |rack_handler|
+  rack_boot do |rack_handler|
     # deafult host is required
     unless Lux.config.host.to_s.include?('http')
       raise 'Invalid "Lux.config.host"'
     end
 
     if Lux.config(:dump_errors)
+      require 'binding_of_caller'
       require 'better_errors'
 
       rack_handler.use BetterErrors::Middleware
@@ -280,7 +281,7 @@ class Lux::Application
         case data = object.call
           when Array
             response.status = data.first
-            response.body data[2]
+            response.body data[2].is_a?(Array) ? data[2][0] : data[2]
           else
             response.body data
         end
@@ -340,13 +341,15 @@ class Lux::Application
   def main
     return if deliver_static_assets
 
+    magic = MagicRoutes.new self
+
     catch(:done) do
-      class_callback :before
-      class_callback :routes unless body?
+      class_callback :before, magic
+      class_callback :routes, magic unless body?
     end
 
     catch(:done) do
-      class_callback :after
+      class_callback :after, magic
     end
   rescue => e
     response.body { nil }

data/lib/lux/application/lib/magic_routes.rb

@@ -0,0 +1,16 @@
+# Maps routes to method missing for cleaner interface
+#    routes do |r|
+#      map :about => 'root#about'
+#      r.about 'root#about'
+class Lux::Application::MagicRoutes
+
+  def initialize app
+    @app = app
+  end
+
+  def method_missing route, *args, &block
+    @app.map [route, args.first || block]
+  end
+
+end
+

data/lib/lux/application/lib/nav.rb

@@ -22,11 +22,15 @@ class Lux::Application::Nav
     parts = @path.last.split('.')
 
     if parts[1]
-      @format    = parts.pop.to_s.downcase.to_sym
+      @format    = @format_once = parts.pop.to_s.downcase.to_sym
       @path.last = parts.join('.')
     end
   end
 
+  def get_format_once
+    @format_once.tap { @format_once = nil }
+  end
+
   def active_shift
     @active = @path.shift
   end

data/lib/lux/controller/controller.rb

@@ -39,15 +39,6 @@ class Lux::Controller
     @base_template = self.class.to_s.include?('::') ? self.class.to_s.sub(/Controller$/,'').underscore : self.class.to_s.sub(/Controller$/,'').downcase
   end
 
-  # because we can call action multiple times
-  # ensure we execute filters only once
-  def filter fiter_name, arg=nil
-    return if @executed_filters[fiter_name]
-    @executed_filters[fiter_name] = true
-
-    Object.class_callback fiter_name, self, @controller_action
-  end
-
   def cache *args, &block
     Lux.cache.fetch *args, &block
   end
@@ -246,4 +237,12 @@ class Lux::Controller
     end
   end
 
+  # because we can call action multiple times
+  # ensure we execute filters only once
+  def filter fiter_name, arg=nil
+    return if @executed_filters[fiter_name]
+    @executed_filters[fiter_name] = true
+
+    Object.class_callback fiter_name, self, @controller_action
+  end
 end

data/lib/lux/current/current.rb

@@ -39,6 +39,7 @@ class Lux::Current
     @nav = Lux::Application::Nav.new request
   end
 
+  # Domain part of the host
   def domain
     host = Lux.current.request.host.split('.')
     host_country = host.pop
@@ -46,32 +47,35 @@ class Lux::Current
     host_name ? "#{host_name}.#{host_country}" : host_country
   end
 
+  # Full host with port
   def host
     "#{request.env['rack.url_scheme']}://#{request.host}:#{request.port}".sub(':80','')# rescue 'http://locahost:3000'
   end
 
+  # Current scope variables hash
   def var
     Thread.current[:lux][:var] ||= Hashie::Mash.new
   end
 
-  # cache data in current page
+  # Cache data in current page
   def cache key
     data = Thread.current[:lux][:cache][key]
     return data if data
     Thread.current[:lux][:cache][key] = yield
   end
 
-  # set current.can_clear_cache = true in production for admins
+  # Set current.can_clear_cache = true in production for admins
   def no_cache?
     @can_clear_cache = true if Lux.dev?
     @can_clear_cache && @request.env['HTTP_CACHE_CONTROL'].to_s.downcase == 'no-cache' ? true : false
   end
 
+  # Redirect from current page
   def redirect *args
     response.redirect *args
   end
 
-  # execute action once per page
+  # Execute action once per page
   def once id=nil, data=nil, &block
     id ||= Digest::SHA1.hexdigest caller[0] if block
 
@@ -82,11 +86,13 @@ class Lux::Current
     block_given? ? yield : data
   end
 
+  # Generete unique ID par page render
   def uid
     Thread.current[:uid_cnt] ||= 0
     "uid-#{Thread.current[:uid_cnt]+=1}"
   end
 
+  # Add to list of files in use
   def files_in_use file=nil
     if block_given?
       return yield(file) unless @files_in_use.include?(file)

data/lib/lux/lux.rb

@@ -139,7 +139,9 @@ module ::Lux
   # must be called when serving web pages from rackup
   def serve rack_handler
     @rackup_start = true
-    Object.class_callback :web_boot, Lux::Application, rack_handler
+
+    # Boot Lux
+    Object.class_callback :rack_boot, Lux::Application, rack_handler
     rack_handler.run self
   end
 

data/lib/overload/hash.rb

@@ -109,6 +109,11 @@ class Hash
     transform_keys!{ |key| key.to_sym rescue key }
   end
 
+  def pretty_generate
+    JSON.pretty_generate(self).gsub(/"([\w\-]+)":/) { %["#{$1.yellow}":] }
+  end
+
+  # Returns hash with only se
   def slice *keys
     keys.map! { |key| convert_key(key) } if respond_to?(:convert_key, true)
     keys.each_with_object(self.class.new) { |k, hash| hash[k] = self[k] if has_key?(k) }
@@ -124,8 +129,21 @@ class Hash
     omit
   end
 
-  def pretty_generate
-    JSON.pretty_generate(self).gsub(/"([\w\-]+)":/) { %["#{$1.yellow}":] }
+  # Returns a hash that includes everything but the given keys.
+  #    hash = { a: true, b: false, c: nil}
+  #    hash.except(:c) # => { a: true, b: false}
+  #    hash # => { a: true, b: false, c: nil}
+  #
+  # This is useful for limiting a set of parameters to everything but a few known toggles:
+  #    @person.update(params[:person].except(:admin))
+  def except(*keys)
+    dup.except!(*keys)
+  end
+
+  # Hash#except in place, modifying current hash
+  def except!(*keys)
+    keys.each { |key| delete(key) }
+    self
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lux-fw
 version: !ruby/object:Gem::Version
-  version: 0.5.36
+  version: 0.5.37
 platform: ruby
 authors:
 - Dino Reic
@@ -262,6 +262,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
+- !ruby/object:Gem::Dependency
+  name: binding_of_caller
+  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: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 description: Ruby framework optimized for speed and linghtness
 email: rejotl@gmail.com
 executables:
@@ -302,6 +330,7 @@ files:
 - "./lib/lux/README.md"
 - "./lib/lux/application/README.md"
 - "./lib/lux/application/application.rb"
+- "./lib/lux/application/lib/magic_routes.rb"
 - "./lib/lux/application/lib/nav.rb"
 - "./lib/lux/application/lib/render.rb"
 - "./lib/lux/cache/.DS_Store"