shaf 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 749585960501bd61a7e7f4f22c2a90c2108f86c6cf0698ec87f495bb78d87389
-  data.tar.gz: da5fc9e7f87876f12654d5ea8473e7f0cd4a9dc3daba88055a51f7aaf0a794a5
+SHA1:
+  metadata.gz: 33b4f2f8ba33dcc7d3f8abe950745897fca2439e
+  data.tar.gz: d677b6e4db2843c764027e91b00ee384a24baa60
 SHA512:
-  metadata.gz: '017559afb07a1d9e142a96c09c406cd697b6c797732661c8f431a1b2803c5c9e8c9c04cd7718037638a440ad077a55eaf1b382a9cdb47687b4bef7921b6ae4c5'
-  data.tar.gz: 3d2a16944a04292fd9039b2dbe5f482950296b7f1dd853e383cdbed972f33755243b16a89b5b081f53da43d456c4b1c8f081ac31ecdbcea66fce3076b2b6ec78
+  metadata.gz: 24eaf2fb8f70443206460d48853ea44d304c1616a65be60defb33147ee09e53923ee13b3563efc0ad00ce41976d7acd6048047d3b1f6d0323341fc9946900546
+  data.tar.gz: 7714930986d85adea752deb9bd7c200a3a7f06cb10826f4e39c9b066dd96b4fd58bae7e327c8fe8bc5e276ab781a9112e8d123e2787a4676fec09a06d10954fd

data/lib/shaf/command.rb

@@ -62,3 +62,4 @@ require 'shaf/command/upgrade'
 require 'shaf/command/server'
 require 'shaf/command/console'
 require 'shaf/command/generate'
+require 'shaf/command/version'

data/lib/shaf/command/new.rb

@@ -1,7 +1,6 @@
 require 'fileutils'
 require 'yaml'
 require 'erb'
-require 'shaf/version'
 
 module Shaf
   module Command

data/lib/shaf/command/version.rb

@@ -0,0 +1,25 @@
+module Shaf
+  module Command
+    class Version < Base
+
+      identifier %r(\Av(ersion)?\Z)
+      usage 'version'
+
+      def call
+        print_shaf_version
+        print_project_version
+      end
+
+      def print_shaf_version
+        puts "Installed Shaf version: #{Shaf::VERSION}"
+      end
+
+      def print_project_version
+        path = project_root
+        return if path.nil?
+        project = path.split('/').last
+        puts "Project '#{project}' created with Shaf version: #{read_shaf_version}"
+      end
+    end
+  end
+end

data/lib/shaf/errors.rb

@@ -1,6 +1,8 @@
 module Shaf
+  class Error < StandardError; end
+
   module Errors
-    class ServerError < StandardError
+    class ServerError < Error
       attr_reader :code, :title
 
       def http_status

data/lib/shaf/generator/scaffold.rb

@@ -10,6 +10,7 @@ module Shaf
           raise "Please provide a resource name when using the scaffold generator!"
         end
 
+        options[:specs] = true if options[:specs].nil? 
         Generator::Factory.create('model', *args).call(options)
         Generator::Factory.create('controller', *controller_args).call(options)
       end

data/lib/shaf/helpers/payload.rb

@@ -72,16 +72,25 @@ module Shaf
       return name == '_method'
     end
 
-    def respond_with_collection(resource, status: 200, serializer: nil)
-      respond_with(resource, status: status, serializer: serializer, collection: true)
+    def respond_with_collection(resource, status: 200, serializer: nil, **kwargs)
+      respond_with(
+        resource,
+        status: status,
+        serializer: serializer,
+        collection: true,
+        **kwargs
+      )
     end
 
-    def respond_with(resource, status: 200, serializer: nil, collection: false)
+    def respond_with(resource, status: 200, serializer: nil, collection: false, **kwargs)
       status(status)
 
       preferred_response = preferred_response_type(resource)
       serialized = serialize(resource, serializer, collection)
 
+      http_cache = kwargs.fetch(:http_cache, Settings.http_cache)
+      add_cache_headers(serialized) if http_cache
+
       if preferred_response == mime_type(:html)
         respond_with_html(resource, serialized)
       else
@@ -108,12 +117,18 @@ module Shaf
       log.debug "Responding with html. Output payload (#{resource.class}): #{serialized}"
       content_type :html
       case resource
-      when Shaf::Formable::Form
+      when Formable::Form
         body erb(:form, locals: {form: resource, serialized: serialized})
       else
         body erb(:payload, locals: {serialized: serialized})
       end
     end
 
+    def add_cache_headers(payload)
+      return if payload.nil? || payload.empty?
+
+      sha1 = Digest::SHA1.hexdigest payload
+      etag sha1, :weak # Weak or Strong??
+    end
   end
 end

data/lib/shaf/upgrade/package.rb

@@ -36,13 +36,13 @@ module Shaf
         private
 
         def target_versions
-          return @target_versions if @target_versions
+          return @target_versions if defined? @target_versions
 
           files = Dir[File.join(UPGRADE_FILES_PATH, '*.tar.gz')]
-          @target_versions = files.each_with_object([]) do |file, versions|
+          @target_versions = files.map do |file|
             str = File.basename(file, '.tar.gz')
-            versions << Version.new(str)
-          end
+            Version.new(str)
+          end.sort
         end
 
         def strip_suffix(file)

data/lib/shaf/utils.rb

@@ -1,3 +1,5 @@
+require 'shaf/version'
+
 module Shaf
   module Utils
     class ProjectRootNotFound < StandardError; end
@@ -24,18 +26,19 @@ module Shaf
       noun[0..-2]
     end
 
+    def pluralize(noun)
+      Utils::pluralize(noun)
+    end
+
     def gem_root
       self.class.gem_root
     end
 
     def project_root
+      return @project_root if defined? @project_root
       dir = Dir.pwd
-      20.times do
-        if is_project_root?(dir)
-          return dir
-        elsif dir == '/'
-          break
-        end
+      while dir != '/' do
+        return @project_root = dir if is_project_root?(dir)
         dir = File.expand_path("..", dir)
       end
     end
@@ -68,16 +71,18 @@ module Shaf
       end
     end
 
-    def pluralize(noun)
-      Utils::pluralize(noun)
-    end
-
     def read_shaf_file
       return {} unless File.exist? SHAF_VERSION_FILE
       str = File.read(SHAF_VERSION_FILE)
       YAML.load(str) || {}
     end
 
+    def read_shaf_file!
+      in_project_root do
+        read_shaf_file
+      end
+    end
+
     def write_shaf_file(data = {})
       data = read_shaf_file.merge(data)
       File.write SHAF_VERSION_FILE,

data/lib/shaf/version.rb

@@ -1,3 +1,3 @@
 module Shaf
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/templates/api/controllers/root_controller.rb

@@ -1,8 +1,10 @@
 class RootController < BaseController
 
-  register_uri :root,    '/'
+  HTTP_CACHE_MAX_AGE = 86400 # 60 * 60 * 24 = 1 day
+  register_uri :root, '/'
 
   get root_uri do
+    cache_control(:private, max_age: HTTP_CACHE_MAX_AGE) if Shaf::Settings.http_cache
     respond_with nil, serializer: RootSerializer
   end
 end

data/templates/config/settings.yml

@@ -7,6 +7,7 @@ default: &default
   migrations_dir: db/migrations
   fixtures_dir: spec/fixtures
   paginate_per_page: 25
+  http_cache: on
 
 production:
   <<: *default

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shaf
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Sammy Henningsson
@@ -30,7 +30,7 @@ cert_chain:
   ZMhjYR7sRczGJx+GxGU2EaR0bjRsPVlC4ywtFxoOfRG3WaJcpWGEoAoMJX6Z0bRv
   M40=
   -----END CERTIFICATE-----
-date: 2018-07-16 00:00:00.000000000 Z
+date: 2018-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -71,6 +71,7 @@ files:
 - lib/shaf/command/server.rb
 - lib/shaf/command/templates/Gemfile.erb
 - lib/shaf/command/upgrade.rb
+- lib/shaf/command/version.rb
 - lib/shaf/doc_model.rb
 - lib/shaf/errors.rb
 - lib/shaf/extensions.rb
@@ -157,6 +158,7 @@ files:
 - templates/spec/integration/root_spec.rb
 - templates/spec/serializers/root_serializer_spec.rb
 - templates/spec/spec_helper.rb
+- upgrades/0.4.0.tar.gz
 homepage: https://github.com/sammyhenningsson/shaf
 licenses:
 - MIT
@@ -178,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Sinatra Hypermedia Api Framework