whales_actions 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4f1a9a93db81f15a84a14a25821077d696a96b5
-  data.tar.gz: 8df87e596aed8593a70f9d25a16d80e539b9f93c
+  metadata.gz: 87ecae3119c2ffc12414e91eaf3fac2e0b1f4176
+  data.tar.gz: dab55c6a86c22990c2b8752ae7fe56afded4fd9f
 SHA512:
-  metadata.gz: d8b2d94420fb72107228c08a0c89a4c62aa6beb5cc8f7f158798712b331a460da0a73a24f2016978f900cd169a1416265a75e8707f5b368008356c8b69c68d66
-  data.tar.gz: f97af9c79477326a1891188d3df84c848877a10d164c11d6dca84e7380c170551aa3d843a0bc88bda996a0095f03799f747803883247d2b0ccfc887637a7fd01
+  metadata.gz: 633406531f3e53344e7c6c1ae4ab32955dc6c184049919160b0a4e73e0e59f129f60547aea9e7ad485bb94c23bb7ee7c0f8f87e3bbbb94ffabae3d411e96c04f
+  data.tar.gz: b1ebd2525e958ebdaae24fd364768e7251de7b8fee23dd822debc81b1cc3df1262c2d5a860f828eb29770f6df28bcfc8704b50b1c6ad07f012c31a3d0d44c7d2

data/lib/whales_actions/version.rb

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

data/lib/whales_controller/base.rb

@@ -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/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

@@ -17,28 +17,28 @@ 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)
-    #
-    #   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
+    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
 
     HTML_METHODS.each do |http_method|
       define_method(http_method) do |pattern, controller_class, action_name|

data/lib/whales_dispatch/session.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: whales_actions
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - William Horton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-13 00:00:00.000000000 Z
+date: 2015-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -173,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: The VC in the Whales MVC framework