whales_actions 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 729d14e7c36e47baa7b6ece335aa8855df26100a
-  data.tar.gz: 76b3bdfb42daa6e6bdf9bdc73f3c84462d1e0529
+  metadata.gz: d4f1a9a93db81f15a84a14a25821077d696a96b5
+  data.tar.gz: 8df87e596aed8593a70f9d25a16d80e539b9f93c
 SHA512:
-  metadata.gz: ba5c27610cecae1f4c44845af782b13fdfbc836b7560b3c5faedaff0d5549aee36d4f928c533d17c61193e351e9383864a3061d0cb968621e4db05f36c228532
-  data.tar.gz: 6fae79cb8f83a022596053bac703e027e761e1a8adee893e1be1c024c8890eb80e54b88a2c13443729130b264c7d4f6a2d171f1587e6dd1d01f689a7520a36a7
+  metadata.gz: d8b2d94420fb72107228c08a0c89a4c62aa6beb5cc8f7f158798712b331a460da0a73a24f2016978f900cd169a1416265a75e8707f5b368008356c8b69c68d66
+  data.tar.gz: f97af9c79477326a1891188d3df84c848877a10d164c11d6dca84e7380c170551aa3d843a0bc88bda996a0095f03799f747803883247d2b0ccfc887637a7fd01

data/Gemfile

@@ -1,6 +1,3 @@
 source 'https://rubygems.org'
 
 gemspec
-
-gem "webrick"
-gem "activesupport"

data/Gemfile.lock

@@ -1,12 +1,15 @@
 PATH
   remote: .
   specs:
-    whales_actions (0.1.0)
+    whales_actions (0.1.1)
+      activesupport
+      json (= 1.8.3)
+      webrick
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.4)
+    activesupport (4.2.5)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -75,14 +78,12 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport
   bundler (~> 1.10)
   guard
   guard-rspec
   pry
   rake (~> 10.0)
   rspec
-  webrick
   whales_actions!
 
 BUNDLED WITH

data/Rakefile

@@ -4,7 +4,7 @@ require "rspec/core/rake_task"
 # Default directory to look in is `/specs`
 # Run with `rake spec`
 RSpec::Core::RakeTask.new(:spec) do |task|
-  task.rspec_opts = ['--color', '--format', 'nested']
+  task.rspec_opts = ['--color']
 end
 
 task :default => :spec

data/lib/whales_actions/version.rb

@@ -1,3 +1,3 @@
 module WhalesActions
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/whales_controller/base.rb

@@ -10,7 +10,7 @@ require_relative '../whales_dispatch/session'
 
 module WhalesController
   class Base
-  attr_reader :params
+    attr_reader :params
     attr_accessor :res, :req
 
     def initialize(request, response, route_params = {})
@@ -46,7 +46,7 @@ module WhalesController
       self.res.body = content
       @already_built_response = true
       session.store_session(res)
-      flash.store_flash(res)
+      # flash.store_flash(res)
     end
 
     def redirect_to(url)
@@ -55,7 +55,7 @@ module WhalesController
       self.res.status = 302
       @already_built_response = true
       session.store_session(res)
-      flash.store_flash(res)
+      # flash.store_flash(res)
     end
 
     def render(template_name, file_location = nil)
@@ -72,9 +72,9 @@ module WhalesController
     private
 
     def verify_authenticity_token
-      unless params[:authenticity_token] == session["authenticity_token"]
-        raise "Missing authenticity token"
-      end
+      # unless params[:authenticity_token] == session["authenticity_token"]
+      #   raise "Missing authenticity token"
+      # end
     end
 
   end

data/lib/whales_dispatch/default_actions.rb

@@ -1,59 +1,59 @@
-class DefaultActions
-  attr_reader :actions
-  def initialize(resource)
-    @resource = resource.to_s
-    @resource_id = @resource.singularize + "_id"
-    @actions = all
-  end
-
-  def parse_action_restrictions(restrictions_hash)
-    raise(ArgumentError) if restrictions_hash.size > 1
-    send(:only, restrictions_hash[:only]) if restrictions_hash[:only]
-    send(:except, restrictions_hash[:except]) if restrictions_hash[:except]
-  end
-
-  def index
-    { index: { suffix: "$", method: :get } }
-  end
-
-  def show
-    { show: { suffix: "/(?<#{@resource_id}>\\d+)$", method: :post } }
-  end
-
-  def new
-    { new: { suffix: "/new$", method: :get } }
-  end
-
-  def create
-    { create: { suffix: "$", method: :post } }
-  end
-
-  def edit
-    { edit: { suffix: "/(?<#{@resource_id}>\\d+)/edit$", method: :get } }
-  end
-
-  def update
-    { update: { suffix: "/(?<#{@resource_id}>\\d+)$", method: :put } }
-  end
-
-  def destroy
-    { destroy: { suffix: "/(?<#{@resource_id}>\\d+)$", method: :delete } }
-  end
-
-  private
-
-    def all
-      DefaultActions.instance_methods(false).drop(2).reduce({}) do |accum, method|
-        accum.merge(send(method))
-      end
-    end
-
-    def only(action_names)
-      @actions.keep_if { |key, _| action_names.include?(key) }
-    end
-
-    def except(action_names)
-      @actions.keep_if { |key, _| !action_names.include?(key) }
-    end
-
-end
+# class DefaultActions
+#   attr_reader :actions
+#   def initialize(resource)
+#     @resource = resource.to_s
+#     @resource_id = @resource.singularize + "_id"
+#     @actions = all
+#   end
+#
+#   def parse_action_restrictions(restrictions_hash)
+#     raise(ArgumentError) if restrictions_hash.size > 1
+#     send(:only, restrictions_hash[:only]) if restrictions_hash[:only]
+#     send(:except, restrictions_hash[:except]) if restrictions_hash[:except]
+#   end
+#
+#   def index
+#     { index: { suffix: "$", method: :get } }
+#   end
+#
+#   def show
+#     { show: { suffix: "/(?<#{@resource_id}>\\d+)$", method: :post } }
+#   end
+#
+#   def new
+#     { new: { suffix: "/new$", method: :get } }
+#   end
+#
+#   def create
+#     { create: { suffix: "$", method: :post } }
+#   end
+#
+#   def edit
+#     { edit: { suffix: "/(?<#{@resource_id}>\\d+)/edit$", method: :get } }
+#   end
+#
+#   def update
+#     { update: { suffix: "/(?<#{@resource_id}>\\d+)$", method: :put } }
+#   end
+#
+#   def destroy
+#     { destroy: { suffix: "/(?<#{@resource_id}>\\d+)$", method: :delete } }
+#   end
+#
+#   private
+#
+#     def all
+#       DefaultActions.instance_methods(false).drop(2).reduce({}) do |accum, method|
+#         accum.merge(send(method))
+#       end
+#     end
+#
+#     def only(action_names)
+#       @actions.keep_if { |key, _| action_names.include?(key) }
+#     end
+#
+#     def except(action_names)
+#       @actions.keep_if { |key, _| !action_names.include?(key) }
+#     end
+#
+# end

data/lib/whales_dispatch/flash.rb

@@ -6,7 +6,7 @@ module WhalesDispatch
 
     def initialize(request)
       request.cookies.each do |cookie|
-        @value_for_now = JSON.parse(cookie.value) if cookie.name == '_rails_lite_flash'
+        @value_for_now = JSON.parse(cookie.value) if cookie.name == '_whales_flash'
       end
       @value_for_now ||= {}
       @value_for_next = {}
@@ -26,7 +26,7 @@ module WhalesDispatch
     end
 
     def store_flash(response)
-      cookie = WEBrick::Cookie.new('_rails_lite_flash', @value_for_next.to_json)
+      cookie = WEBrick::Cookie.new('_whales_flash', @value_for_next.to_json)
       cookie.path = '/'
       response.cookies << cookie
     end

data/lib/whales_dispatch/resource.rb

@@ -1,25 +1,25 @@
-class Resource
-  attr_reader :pattern
-
-  def initialize(noun, suffix, parent)
-    @noun = noun.to_s
-    @pattern = build_route_pattern(suffix, parent)
-  end
-
-  def build_route_pattern(suffix, parent)
-    base = build_base(parent)
-    Regexp.new(base + @noun + suffix)
-  end
-
-  def build_base(parent)
-    if parent.empty?
-      "^/"
-    else
-      "^/#{parent}/(?<#{parent.singularize}_id>\\d+)/"
-    end
-  end
-
-  def classify
-    klass = Object.const_get(@noun.capitalize + "Controller")
-  end
-end
+# class Resource
+#   attr_reader :pattern
+#
+#   def initialize(noun, suffix, parent)
+#     @noun = noun.to_s
+#     @pattern = build_route_pattern(suffix, parent)
+#   end
+#
+#   def build_route_pattern(suffix, parent)
+#     base = build_base(parent)
+#     Regexp.new(base + @noun + suffix)
+#   end
+#
+#   def build_base(parent)
+#     if parent.empty?
+#       "^/"
+#     else
+#       "^/#{parent}/(?<#{parent.singularize}_id>\\d+)/"
+#     end
+#   end
+#
+#   def classify
+#     klass = Object.const_get(@noun.capitalize + "Controller")
+#   end
+# end

data/lib/whales_dispatch/router.rb

@@ -1,11 +1,12 @@
 module WhalesDispatch
   class Router
 
+    HTML_METHODS = [:get, :post, :patch, :put, :delete]
     attr_reader :routes
 
     def initialize
       @routes = []
-      @last_parent_route = ""
+      # @last_parent_route = ""
     end
 
     def add_route(pattern, method, controller_class, action_name)
@@ -16,30 +17,30 @@ module WhalesDispatch
       instance_eval(&proc)
     end
 
-    def resources(controller_noun, scope, **action_restrictions)
-      @last_parent_route = "" if scope == :parent
-      controller_actions = DefaultActions.new(controller_noun)
-      controller_actions.parse_action_restrictions(action_restrictions)
-      build_resources(controller_noun, controller_actions)
+    # def resources(controller_noun, scope, **action_restrictions)
+    #   @last_parent_route = "" if scope == :parent
+    #   controller_actions = DefaultActions.new(controller_noun)
+    #   controller_actions.parse_action_restrictions(action_restrictions)
+    #   build_resources(controller_noun, controller_actions)
+    #
+    #   if block_given?
+    #     @last_parent_route = controller_noun.to_s
+    #     yield
+    #   end
+    # end
+    #
+    # def build_resources(controller_noun, controller_actions)
+    #   controller_actions.actions.each do |action_name, action_hash|
+    #
+    #     resource = Resource.new(
+    #       controller_noun, action_hash[:suffix], @last_parent_route
+    #     )
+    #
+    #     send action_hash[:method], resource.pattern, resource.classify, action_name
+    #   end
+    # end
 
-      if block_given?
-        @last_parent_route = controller_noun.to_s
-        yield
-      end
-    end
-
-    def build_resources(controller_noun, controller_actions)
-      controller_actions.actions.each do |action_name, action_hash|
-
-        resource = Resource.new(
-          controller_noun, action_hash[:suffix], @last_parent_route
-        )
-
-        send action_hash[:method], resource.pattern, resource.classify, action_name
-      end
-    end
-
-    [:get, :post, :put, :delete].each do |http_method|
+    HTML_METHODS.each do |http_method|
       define_method(http_method) do |pattern, controller_class, action_name|
         add_route(pattern, http_method, controller_class, action_name)
       end
@@ -58,6 +59,6 @@ module WhalesDispatch
         res.body = "Could not find matching route."
       end
     end
-    
+
   end
 end

data/lib/whales_dispatch/session.rb

@@ -1,4 +1,4 @@
-require 'json'
+require 'yaml'
 require 'webrick'
 
 module WhalesDispatch
@@ -6,7 +6,7 @@ module WhalesDispatch
 
     def initialize(request)
       request.cookies.each do |cookie|
-        @value = JSON.parse(cookie.value) if cookie.name == '_rails_lite_app'
+        @value = YAML.load(cookie.value) if cookie.name == '_whales_app'
       end
       @value ||= {}
     end
@@ -20,9 +20,11 @@ module WhalesDispatch
     end
 
     def store_session(response)
-      cookie = WEBrick::Cookie.new('_rails_lite_app', @value.to_json)
+      cookie = WEBrick::Cookie.new('_whales_app', @value.to_yaml)
+      puts "got past cookie"
       cookie.path = '/'
       response.cookies << cookie
+      puts "added cookie to response"
     end
 
   end

data/whales_actions.gemspec

@@ -15,6 +15,9 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "activesupport"
+  spec.add_dependency "webrick"
+
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
 

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: whales_actions
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - William Horton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-09 00:00:00.000000000 Z
+date: 2015-12-13 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  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: webrick
+  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: bundler
   requirement: !ruby/object:Gem::Requirement