pretzel 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d4b91f04b6560e42b18bd3879f18bef72404f1f
-  data.tar.gz: a4fb8cc81e6aaa6c61ba1d2c5459de761fda4bce
+  metadata.gz: e05d6a69c72f4ba45c60b408450e799144a9e56e
+  data.tar.gz: ec51b8960b12bd6c0e4b8dc2d20057551089ef09
 SHA512:
-  metadata.gz: e4e6fcdc2c2602efb6ac107514df1fa0283d46b714bb30674f4fd8d5afbb9299b4f5de5b3248166aa0ce66d25bd18bbecb1dce43581d1e9cf7dd1fac6960aa42
-  data.tar.gz: c76cbfedea4b99b7bea1a64cefe833338f4dc5965b13f36d4ee9c237dd1c15fd4a42b4e1f40b8170ea9b6b0109f0ee23751f64026ad02c566ae8a15775f1e99a
+  metadata.gz: a5efb05569eaa7bb78ac28685768106aa5e88280c8ad017ea49a06ea756c36119eed674390c096056abdf4a16ef9d1344be52c696ea4b005ffc5941cf29b0637
+  data.tar.gz: 533058ca02af687c4ddbe22e4464cec7a16ccb0d226e2730cc03e8a856a5929fbc7ccffc6c17ab0022944ba71fb4cdeca394cf5ca5d3c58195017eea147afa96

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+bundler_args: --without production
+rvm:
+  - 2.2.0
+  - 2.1.0
+  - 2.0.0

data/Gemfile

@@ -0,0 +1,14 @@
+source "https://rubygems.org"
+
+gem "rack"
+gem "liquid"
+
+group :production do
+  gem "thin"
+end
+
+group :test do
+  gem "minitest"
+  gem "rack-test"
+  gem "rake"
+end

data/Gemfile.lock

@@ -0,0 +1,26 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    daemons (1.1.9)
+    eventmachine (1.0.7)
+    liquid (3.0.1)
+    minitest (5.5.1)
+    rack (1.6.0)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rake (10.4.2)
+    thin (1.6.3)
+      daemons (~> 1.0, >= 1.0.9)
+      eventmachine (~> 1.0)
+      rack (~> 1.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  liquid
+  minitest
+  rack
+  rack-test
+  rake
+  thin

data/README.md

@@ -1,2 +1,7 @@
+
 # pretzel
-The basic Pretzel application kit. Extensible and fun to work with!
+![TravisCI badge](https://travis-ci.org/pretzelhands/pretzel.svg?branch=master)
+![Version badge](https://badge.fury.io/rb/pretzel.svg)
+[![Code Climate](https://codeclimate.com/github/pretzelhands/pretzel/badges/gpa.svg)](https://codeclimate.com/github/pretzelhands/pretzel)
+
+ReadMe coming soon.

data/lib/pretzel/core.rb

@@ -3,10 +3,20 @@ require "forwardable"
 require "securerandom"
 
 require_relative "version"
+require_relative "ext/convenience"
+
+require_relative "routing/eval"
+require_relative "routing/methods"
 
 module Pretzel
   class Core
+    include Pretzel::Routing::Evaluation
+    extend Pretzel::Routing::Methods
+
+    include Pretzel::Extension::Convenience
+
     attr_reader :request, :response, :parameters
+
     class << self
       extend Forwardable
       def_delegators :builder, :map, :use
@@ -29,36 +39,6 @@ module Pretzel
         builder
       end
 
-      %w(get post delete put options head).each do |verb|
-        define_method(verb) do |route, &block|
-          routes[verb.to_sym] << [compile_route(route), block]
-        end
-      end
-
-      %w(before after).each do |filter|
-        define_method(filter) do |&block|
-          filters[filter.to_sym] ||= Array.new
-          filters[filter.to_sym] << block
-        end
-      end
-
-      # For all regex lovers.
-      private
-      def compile_route(pattern)
-        keys = []
-        pattern = pattern[0...-1] if pattern.end_with?("/")
-        pattern.gsub!(/(:\w+)/) do # Get all colon-prefixed params
-          keys << $1[1..-1] # Put the name of them into the keys array.
-          "([^/?#]+)" # Substitute with a capture group.
-        end
-        # Return the regex and the param names.
-        if pattern != "/" # No trailing slash for the root route.
-          [%r{^#{pattern}\/?$}, keys] 
-        else
-          [%r{^#{pattern}$}, keys] 
-        end
-      end
-
       def builder
         @builder ||= Rack::Builder.new
       end
@@ -78,6 +58,9 @@ module Pretzel
       @response = Rack::Response.new
       @parameters = request.params
 
+      @response["Server"] = "Ruby/#{RUBY_VERSION}"
+      @response["X-Generated-By"] = "Pretzel/#{Pretzel::VERSION}"
+
       evaluate_route
 
       @response.finish
@@ -88,41 +71,6 @@ module Pretzel
       response.header.merge!(res.detect{|x| x.is_a?(Hash) } || {})
       response.body = [res.detect{|x| x.is_a?(String) } || ""]
       throw :halt, response
-    end
-
-    def status(status)
-      response.status = status
-    end
-
-    def session
-      request.session || raise("Rack::Session not set.")
-    end
-
-    def redirect(url)
-      response.redirect url
-    end
-
-    private
-    def evaluate_route
-      catch(:halt) do
-        response["Server"] = "Ruby/#{RUBY_VERSION}"
-        response["X-Generated-By"] = "Pretzel/#{Pretzel::VERSION}"
-
-        self.class.routes[request.request_method.downcase.to_sym].each do |route, block|
-          if matching_route = request.path_info.match(route[0])
-            if (route_captures = matching_route.captures) && !route_captures.empty?
-              route_parameters = Hash[*route[1].zip(route_captures).flatten]
-              @parameters = route_parameters.merge(parameters)
-            end
-            
-            self.class.filters[:before].each { |filter| instance_exec(&filter) } unless self.class.filters[:before].nil?
-            response.write instance_eval(&block)
-            self.class.filters[:after].each { |filter| instance_exec(&filter) } unless self.class.filters[:after].nil?
-            return
-          end
-        end
-        halt 404, "Not found."
-      end
-    end
+    end    
   end # end class
 end # end module

data/lib/pretzel/ext/convenience.rb

@@ -0,0 +1,19 @@
+module Pretzel
+  module Extension
+    module Convenience
+
+      def status(status)
+        response.status = status
+      end
+
+      def session
+        request.session || raise("Rack::Session not set.")
+      end
+
+      def redirect(url)
+        response.redirect url
+      end
+
+    end
+  end
+end

data/lib/pretzel/routing/eval.rb

@@ -0,0 +1,48 @@
+module Pretzel
+  module Routing
+    module Evaluation
+
+      def self.included(parent)
+        parent.extend ClassMethods
+      end
+
+      # For all regex lovers.
+      module ClassMethods
+        def compile_route(pattern)
+          keys = []
+          pattern = pattern[0...-1] if pattern.end_with?("/")
+          pattern.gsub!(/(:\w+)/) do # Get all colon-prefixed params
+            keys << $1[1..-1] # Put the name of them into the keys array.
+            "([^/?#]+)" # Substitute with a capture group.
+          end
+          # Return the regex and the param names.
+          if pattern != "/" # No trailing slash for the root route.
+            [%r{^#{pattern}\/?$}, keys] 
+          else
+            [%r{^#{pattern}$}, keys] 
+          end
+        end
+      end
+
+      private
+      def evaluate_route
+        catch(:halt) do
+          method = request.request_method.downcase.to_sym
+
+          self.class.routes[method].each do |route, block|
+            if request.path_info.match(route[0])
+              self.class.filters[:before].each { |filter| instance_exec(&filter) } if self.class.filters[:before]
+              response.write instance_eval(&block)
+              self.class.filters[:after].each { |filter| instance_exec(&filter) } if self.class.filters[:after]
+              
+              return
+            end
+          end
+          
+          halt 404, "Not found."
+        end
+      end
+
+    end
+  end
+end

data/lib/pretzel/routing/methods.rb

@@ -0,0 +1,20 @@
+module Pretzel
+  module Routing
+    module Methods
+      
+      %w(get post delete put options head).each do |verb|
+        define_method(verb) do |route, &block|
+          routes[verb.to_sym] << [compile_route(route), block]
+        end
+      end
+
+      %w(before after).each do |filter|
+        define_method(filter) do |&block|
+          filters[filter.to_sym] ||= Array.new
+          filters[filter.to_sym] << block
+        end
+      end
+
+    end
+  end
+end

data/lib/pretzel/version.rb

@@ -1,3 +1,3 @@
 module Pretzel
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/pretzel.gemspec

@@ -10,6 +10,8 @@ Gem::Specification.new do |s|
   s.email       = ["richard@blechi.at"]
   s.homepage    = "http://github.com/pretzelhands/pretzel"
 
+  s.required_ruby_version = ">= 2.0.0"
+
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ["lib"]

data/test/scrap.rb

@@ -2,8 +2,6 @@
 # implemented. The code here is not intended to be sensible.
 
 require_relative "setup_environment"
-require "pretzel/templating"
-require "pretzel/json"
 
 class ScrapApplication < Pretzel::Core
   include Pretzel::Extension::Templating

data/test/setup_environment.rb

@@ -2,5 +2,8 @@ pretzel_dir = File.dirname(File.dirname(__FILE__)) + '/lib'
 $LOAD_PATH.unshift pretzel_dir unless $LOAD_PATH.include?(pretzel_dir)
 
 require "pretzel/core"
+require "pretzel/ext/templating"
+require "pretzel/ext/json"
+
 require "rack/test"
 require "minitest/autorun"

data/test/test_json.rb

@@ -1,5 +1,4 @@
 require_relative "setup_environment"
-require "pretzel/json"
 require "rack"
 
 class JSONApplication < Pretzel::Core 

data/test/test_templating.rb

@@ -1,5 +1,4 @@
 require_relative "setup_environment"
-require "pretzel/templating"
 require "rack"
 
 class TemplatingApplication < Pretzel::Core 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pretzel
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Richard Blechinger
@@ -88,12 +88,18 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
 - lib/pretzel/core.rb
-- lib/pretzel/json.rb
-- lib/pretzel/templating.rb
+- lib/pretzel/ext/convenience.rb
+- lib/pretzel/ext/json.rb
+- lib/pretzel/ext/templating.rb
+- lib/pretzel/routing/eval.rb
+- lib/pretzel/routing/methods.rb
 - lib/pretzel/version.rb
 - pretzel.gemspec
 - test/assets/test.css
@@ -124,7 +130,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="