vapid 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b99f1a8446492ac2d5abf7a36c03ab771bfeff8f
-  data.tar.gz: 58e5c6732a676566be85c7a2d63d04c672d21889
+  metadata.gz: 504471e3bef72a241996ded672149874d00f0eaf
+  data.tar.gz: 109650d32dbb7d98efb77346628f72168ad6ca4f
 SHA512:
-  metadata.gz: 4a7cae0ccf832297e4c31d15b244817e4aa9248d1bd837b7cbdeea70ffabe7accf90ec2a0d323ef6e9a9ed657e59070de8896aa375769048c06a8d7921e7db2c
-  data.tar.gz: 1fb354a0209079ec0663f468e56654157da5e3351d1d218f7d46142905145231be4b0bbf1f29b5ceb11a5751ce73d06518412c255f01449e1b09c890c8ec8033
+  metadata.gz: ed753ed4e16155ce5562d4059a09c61ad3f5fe9a3dc7658569e4b7e46c21b9e7809c2583d4dba9a14fb9aec1dc0b59465ea2dcbdc265a9e8da8ed15d91e6de0a
+  data.tar.gz: 7b177df1ded95804960165af8578b4213a17dbf63dfd5519b5c0ef62c881c109343efedf3f981dadde1063024ff457809d3d26aad1d6475e59dff2518861ace6

data/lib/vapid.rb

@@ -17,8 +17,4 @@ module Vapid
   autoload :Server,     "vapid/server"
   autoload :Settings,   "vapid/settings"
   autoload :Template,   "vapid/template"
-
-  def self.register_directive(name, klass)
-    Directives.register name, klass
-  end
 end

data/lib/vapid/cli.rb

@@ -38,11 +38,7 @@ module Vapid
     def server(target = ".")
       say "== The Vapid server is loading"
       inside_target(target) do
-        Thread.abort_on_exception = true
-        Thread.new do
-          Server.run! options
-        end
-
+        Thread.new { Server.run! options }
         Guard.start guardfile_contents: GUARDFILE, watchdir: target, no_interactions: true
       end
       say "== The Vapid server is now shut down"

data/lib/vapid/controllers/admin_controller.rb

@@ -10,7 +10,7 @@ module Vapid
         def vp_field(name, type, value = "")
           @directive = Directives[type]
           @name = name
-          @value = value
+          @value = @directive.new(name).send :deserialize_input, value
 
           label(name) +
             template.content_tag(:div) do
@@ -211,6 +211,12 @@ module Vapid
             @group = current_group
             @record = @group.records.build(params[:record])
 
+            # TODO: Externalize this into a function (see update method below)
+            params[:record]["content"].each do |key, val|
+              content_type = current_group.fields[key]
+              @record.content[key] = Directives[content_type].serialize_input(val)
+            end
+
             if @record.save
               flash[:success] = "Record created"
               livereload
@@ -231,15 +237,18 @@ module Vapid
             @group = current_group
             @record = current_record
 
+            # TODO: Externalize this into a function (see create method above)
             params[:record]["content"].each do |key, val|
-              if val.is_a?(Hash) && val[:tempfile]
-                FileUtils.mkdir_p(settings.project_uploads)
-                File.open File.join(settings.project_uploads, val[:filename]), "wb" do |file|
-                  file.write val[:tempfile].read
-                end
-                val = "/uploads/#{val[:filename]}"
-              end
-              @record.content[key] = val
+              # if val.is_a?(Hash) && val[:tempfile]
+              #   FileUtils.mkdir_p(settings.project_uploads)
+              #   File.open File.join(settings.project_uploads, val[:filename]), "wb" do |file|
+              #     file.write val[:tempfile].read
+              #   end
+              #   val = "/uploads/#{val[:filename]}"
+              # end
+
+              content_type = current_group.fields[key]
+              @record.content[key] = Directives[content_type].serialize_input(val)
             end
 
             params[:_destroy] && params[:_destroy].each do |key, _val|

data/lib/vapid/directive.rb

@@ -39,6 +39,13 @@ module Vapid
         destroy
       end
 
+      # Serializes input before it's saved to the database
+      #
+      # @return [String]      
+      def serialize_input(input)
+        input.to_s
+      end
+
       private
 
         attr_accessor :filters, :preview, :destroy
@@ -63,14 +70,26 @@ module Vapid
           @filters[name] = block
         end
 
-        def before_render(&block)
-          define_input_modifier :callback_before_render, &block
+        def deserialize(&block)
+          instance_eval do
+            define_method :deserialize_input do |input|
+              instance_exec input, &block
+            end
+          end
+        end
+
+        def serialize(&block)
+          (class << self; self; end).instance_eval do
+            define_method :serialize_input do |input|
+              block.call input
+            end
+          end
         end
 
         def inherited(subclass)
           # Auto-register directives
           # @todo Shouldn't do this
-          Vapid.register_directive subclass.name.split("::").last.downcase, subclass
+          Vapid::Directives.register subclass.name.split("::").last.downcase, subclass
         end
 
         def define_input_modifier(name, &block)
@@ -94,11 +113,8 @@ module Vapid
     # @return [Object] a Nokogiri-friendly hash of modifiers,
     #   or the original input value
     def render(input = nil)
-      @input = input
-
-      run_before_callback
+      @input = deserialize_input(input)
       apply_filters
-
       render_all
     end
 
@@ -121,11 +137,6 @@ module Vapid
         }.reject { |_k, v| v.blank? }
       end
 
-      def run_before_callback
-        return unless respond_to?(:callback_before_render, true)
-        @input = callback_before_render
-      end
-
       def apply_filters
         @input = @args.reduce(@input) do |input, (name, args)|
           begin
@@ -137,6 +148,10 @@ module Vapid
         end
       end
 
+      def deserialize_input(input)
+        input
+      end
+
       def parse_expression(expression)
         parts = expression.split("|")
         @subject = parts.shift

data/lib/vapid/directives/date.rb

@@ -0,0 +1,31 @@
+module Vapid
+  module Directives
+    # Date directive
+    class Date < Vapid::Directive
+      DEFAULT_FORMAT = "%D"
+
+      serialize do |input|
+        ::Date.parse(input).to_time.to_i
+      end
+
+      deserialize do |input|
+        ::Time.at(input).to_date unless input.blank?
+      end
+
+      # Render
+      renders :text do |input|
+        input.strftime(@format || DEFAULT_FORMAT) unless input.blank?
+      end
+
+      filter :format do |input, fmt|
+        @format = fmt
+        input
+      end
+
+      # Form
+      form do |name, value|
+        date_field_tag name, value: value
+      end
+    end
+  end
+end

data/lib/vapid/directives/group.rb

@@ -6,7 +6,7 @@ module Vapid
 
       renders :all
 
-      before_render do
+      deserialize do |_input|
         Models::Group.named(subject).try(:records)
       end
 
@@ -22,7 +22,7 @@ module Vapid
         fields, desc_indexes = parse_conditions(args)
         values = fetch_values(query, fields)
         sorted_values = sort_values(values, desc_indexes)
-        statement = sorted_values.map { |v| "ID=#{v[0]} DESC" }.join(", ")
+        statement = sorted_values.map { |v| "ID='#{v[0]}' DESC" }.join(", ")
 
         query.order(statement)
       end
@@ -62,7 +62,7 @@ module Vapid
               x[i] = y[i]
               y[i] = orig
             end
-
+            
             x <=> y
           end
         end

data/lib/vapid/directives/href.rb

@@ -6,6 +6,11 @@ module Vapid
       renders :attributes do |input|
         { href: input } if input.present?
       end
+
+      # Form
+      form do |name, value|
+        url_field_tag name, value: value
+      end
     end
   end
 end

data/lib/vapid/server.rb

@@ -17,6 +17,7 @@ module Vapid
   class Server < Sinatra::Base
     configure do
       enable :logging
+      set :quiet,             true
 
       set :gem_pwd,           File.dirname(__FILE__)
       set :gem_assets,        File.join(gem_pwd, "assets")

data/lib/vapid/version.rb

@@ -1,4 +1,4 @@
 # Version
 module Vapid
-  VERSION = "0.1.0".freeze
+  VERSION = "0.1.1".freeze
 end

data/vapid.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "thor", "~> 0.1"
+  spec.add_dependency "thor", "~> 0.20"
   spec.add_dependency "sinatra", "~> 2.0"
   spec.add_dependency "sinatra-contrib", "~> 2.0"
   spec.add_dependency "sinatra-activerecord", "~> 2.0"
@@ -33,7 +33,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "nokogiri", "~> 1.7"
   spec.add_dependency "nokogiri-styles", "~> 0.1"
   spec.add_dependency "bcrypt", "~> 3.1"
-  spec.add_dependency "super_token", "~> 1.0"
   spec.add_dependency "loofah", "~> 2.0"
   spec.add_dependency "rake", "~> 11.3"
   spec.add_dependency "rack-livereload", "~> 0.3"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vapid
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Scott Robbin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-01 00:00:00.000000000 Z
+date: 2017-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.20'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.20'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -192,20 +192,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
-- !ruby/object:Gem::Dependency
-  name: super_token
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: loofah
   requirement: !ruby/object:Gem::Requirement
@@ -378,6 +364,7 @@ files:
 - lib/vapid/directive.rb
 - lib/vapid/directives.rb
 - lib/vapid/directives/audio.rb
+- lib/vapid/directives/date.rb
 - lib/vapid/directives/group.rb
 - lib/vapid/directives/hide.rb
 - lib/vapid/directives/href.rb