locomotivecms_steam 0.1.1 → 0.1.2.pre.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8893681c8f5eb7eb8d2679fd660ae4aed7e731f5
-  data.tar.gz: 9ee2f1cacf9d807e2194f139cabd844743cf3dc7
+  metadata.gz: 4698182a220b4ecc84c67e5b713ef8d5d2a3a76e
+  data.tar.gz: 8a219e0e64af25f14f039791f722ea0529f2cbd0
 SHA512:
-  metadata.gz: 9090a78846cc972558e88da4dba21c6aa44b30585608467ca09e666e18022f85572f3de3861be7e7c95a13433a37410270417edf9a71095c69ad181bb08c5089
-  data.tar.gz: 0ef2642d9cf8fe0d28cf30621f48eabf294ce02d396e37096031455d8f3062b809f88bae38270587b09233d316d8f2580a124e04ce4e0619656b68fd9d6d757d
+  metadata.gz: b96b08b781daeb67c36e9cfa1458c8724e89052f1464390e1bc5b7ead26c78c5be45790ca8506f3d17a3997a98602dd05da95f10d1e40a35d152c67d92e35dac
+  data.tar.gz: 31a63e6267459677d2ec76da6f0017deba6ed9044a5a48104a1dc478632d9e4a1f566493df60c4780975e99ca613ad6b73a4fffb4dc6d717df0885cad992da54

data/.travis.yml

@@ -1,4 +1,3 @@
 language: ruby
 rvm:
-  - 2.0.0
-  - 2.1.1
+  - 2.1.2

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+### VERSION 0.1.2
+
+* enhancements
+  * Change Markdown library from redcarpet to kramdown for support JRuby
+
 ### VERSION 0.1.1
 
 * refactoring

data/Gemfile

@@ -3,7 +3,9 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-  gem 'locomotivecms_common', '~> 0.0.1', require: 'common' # path: '../common'
+  #gem 'locomotivecms_common', '~> 0.0.2', path: '../common'
+  # gem 'locomotivecms_models', '~> 0.0.1', path: '../models'
+  gem 'locomotivecms_models', '0.0.1.pre.alpha'
   gem 'thin'
 end
 
@@ -12,4 +14,10 @@ group :test do
   gem 'coveralls', require: false
 end
 
-gem 'thin'
+platform :jruby do
+  ruby '1.9.3', engine: 'jruby', engine_version: '1.7.11'
+end
+
+platform :ruby do
+  ruby '2.1.2'
+end

data/Gemfile.lock

@@ -1,14 +1,19 @@
 PATH
   remote: .
   specs:
-    locomotivecms_steam (0.1.1)
+    locomotivecms_steam (0.1.2.pre.beta)
+      coffee-script (~> 2.2.0)
+      compass (~> 0.12.2)
       dragonfly (~> 1.0.3)
+      haml (~> 4.0.3)
+      httmultiparty (~> 0.3.10)
+      httparty (~> 0.13)
+      kramdown (~> 1.3.3)
       locomotivecms-solid
-      locomotivecms_common (~> 0.0.1)
-      locomotivecms_mounter
+      locomotivecms_common (~> 0.0.2)
+      locomotivecms_models (~> 0.0.1.pre.alpha)
       moneta (~> 0.7.20)
       rack-cache (~> 1.1)
-      redcarpet (~> 3.1)
       sprockets (~> 2.0)
       sprockets-sass (~> 1.0)
       will_paginate (~> 3.0)
@@ -16,21 +21,21 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    RedCloth (4.2.9)
-    activesupport (3.2.17)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
+    activesupport (4.1.1)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
     addressable (2.3.6)
-    chronic (0.10.2)
-    chunky_png (1.3.0)
+    chunky_png (1.3.1)
     coderay (1.1.0)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
     coffee-script-source (1.7.0)
-    colorize (0.5.8)
-    commonjs (0.2.7)
-    compass (0.12.5)
+    colorize (0.7.3)
+    compass (0.12.6)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
       sass (~> 3.2.19)
@@ -45,17 +50,18 @@ GEM
     daemons (1.1.9)
     diff-lcs (1.2.5)
     docile (1.1.3)
-    dragonfly (1.0.4)
+    dragonfly (1.0.5)
       multi_json (~> 1.0)
       rack
     eventmachine (1.0.3)
-    execjs (2.0.2)
+    execjs (2.2.0)
     fssm (0.2.10)
     haml (4.0.5)
       tilt
     hike (1.2.3)
-    httmultiparty (0.3.10)
+    httmultiparty (0.3.14)
       httparty (>= 0.7.3)
+      mimemagic
       multipart-post
     httparty (0.13.1)
       json (~> 1.8)
@@ -66,39 +72,22 @@ GEM
     iso (0.2.1)
       i18n
     json (1.8.1)
+    kramdown (1.3.3)
     launchy (2.4.2)
       addressable (~> 2.3)
-    less (2.2.2)
-      commonjs (~> 0.2.6)
     locomotivecms-liquid (2.6.0)
     locomotivecms-solid (0.2.2.1)
       locomotivecms-liquid (~> 2.6.0)
-    locomotivecms_common (0.0.1)
-    locomotivecms_mounter (1.4.0)
-      RedCloth (~> 4.2.3)
-      activesupport (~> 3.2.15)
-      chronic (~> 0.10.2)
-      coffee-script (~> 2.2.0)
-      colorize (~> 0.5.8)
-      compass (~> 0.12.2)
-      haml (~> 4.0.3)
-      httmultiparty (= 0.3.10)
-      i18n (~> 0.6.0)
-      json (~> 1.8.0)
-      less (~> 2.2.1)
-      logger
-      mime-types (~> 1.19)
-      multi_json (~> 1.7.3)
-      sass (~> 3.2.12)
-      sprockets (~> 2.0)
-      sprockets-sass
-      stringex (~> 2.0.3)
-      tilt (= 1.4.1)
-      tzinfo (~> 0.3.29)
-      zip (~> 2.0.2)
-    logger (1.2.8)
+    locomotivecms_common (0.0.2)
+      colorize
+    locomotivecms_models (0.0.1.pre.alpha)
+      activesupport (~> 4.1.0)
+      i18n (~> 0.6.9)
+      locomotivecms_common (~> 0.0.1)
     method_source (0.8.2)
     mime-types (1.25.1)
+    mimemagic (0.2.1)
+    minitest (5.3.5)
     moneta (0.7.20)
     multi_json (1.7.9)
     multi_xml (0.5.5)
@@ -113,7 +102,6 @@ GEM
     rack-test (0.6.2)
       rack (>= 1.0)
     rake (10.2.2)
-    redcarpet (3.1.1)
     rest-client (1.6.7)
       mime-types (>= 1.16)
     rspec (2.14.1)
@@ -132,15 +120,14 @@ GEM
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
     slop (3.5.0)
-    sprockets (2.12.0)
+    sprockets (2.12.1)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-sass (1.0.3)
+    sprockets-sass (1.1.0)
       sprockets (~> 2.0)
       tilt (~> 1.1)
-    stringex (2.0.11)
     term-ansicolor (1.3.0)
       tins (~> 1.0)
     thin (1.6.2)
@@ -148,15 +135,16 @@ GEM
       eventmachine (>= 1.0.0)
       rack (>= 1.0.0)
     thor (0.18.1)
+    thread_safe (0.3.4)
     tilt (1.4.1)
     tins (1.0.0)
-    tzinfo (0.3.39)
+    tzinfo (1.2.1)
+      thread_safe (~> 0.1)
     vcr (2.9.0)
     webmock (1.8.11)
       addressable (>= 2.2.7)
       crack (>= 0.1.7)
     will_paginate (3.0.5)
-    zip (2.0.2)
 
 PLATFORMS
   ruby
@@ -166,7 +154,7 @@ DEPENDENCIES
   coveralls
   i18n-spec
   launchy
-  locomotivecms_common (~> 0.0.1)
+  locomotivecms_models (= 0.0.1.pre.alpha)
   locomotivecms_steam!
   pry
   rack-test

data/Rakefile

@@ -1,17 +1,12 @@
 require 'rubygems'
 require 'bundler/setup'
+require 'bundler/gem_tasks'
 
 require 'rake'
 require 'rspec'
 
-require 'rspec/core/rake_task'
-
-require_relative 'lib/steam'
-
-RSpec::Core::RakeTask.new('spec:integration') do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
-end
+require_relative 'lib/locomotive/steam'
 
-task spec: ['spec:integration']
-
-task default: :spec
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new('spec')
+task default: :spec

data/example/server.rb

@@ -6,17 +6,21 @@ require 'bundler/setup'
 Bundler.require
 
 require 'thin'
-require 'common'
+# require 'common'
+require 'locomotive/common'
 
-require_relative '../lib/steam'
+require_relative '../lib/locomotive/steam'
 require_relative '../lib/locomotive/steam/server'
 require_relative '../lib/locomotive/steam/initializers'
 
 path = ENV['SITE_PATH'] || File.join(File.expand_path(File.dirname(__FILE__)), '../spec/fixtures/default')
-reader = Locomotive::Mounter::Reader::FileSystem.instance
-reader.run!(path: path)
 
-app = Locomotive::Steam::Server.new(reader, {
+# reader = Locomotive::Mounter::Reader::FileSystem.instance
+# reader.run!(path: path)
+
+datastore = Locomotive::Steam::FileSystemDatastore.new(path: path)
+
+app = Locomotive::Steam::Server.new(datastore, {
   serve_assets: true
 })
 
@@ -24,4 +28,4 @@ server  = Thin::Server.new('localhost', '3333', app)
 server.threaded = true
 
 Locomotive::Common::Logger.info 'Server started...'
-server.start
+server.start

data/lib/locomotive/steam.rb

@@ -0,0 +1,46 @@
+require 'locomotive/models'
+require 'locomotive/decorators'
+require 'locomotive/common'
+
+require_relative 'steam/exceptions'
+require_relative 'steam/decorators'
+require_relative 'steam/configuration'
+
+require 'sprockets'
+require 'sprockets-sass'
+require 'haml'
+require 'compass'
+
+#require 'httmultiparty'
+require 'mime/types'
+
+module Locomotive
+  module Steam
+    TEMPLATE_EXTENSIONS = %w(liquid haml)
+
+    class << self
+      attr_writer :configuration
+    end
+
+    def self.configuration
+      @configuration ||= Configuration.new
+    end
+
+    def self.reset
+      @configuration = Configuration.new
+    end
+
+    def self.configure
+      yield(configuration)
+    end
+
+    class << self
+      def method_missing(name, *args, &block)
+        Locomotive::Steam.configuration.public_send(name)
+      rescue
+        super
+      end
+    end
+
+  end
+end

data/lib/locomotive/steam/configuration.rb

@@ -0,0 +1,13 @@
+module Locomotive
+  module Steam
+
+    class Configuration
+      attr_accessor :mode
+
+      def initialize
+        self.mode = :production
+      end
+    end
+
+  end
+end

data/lib/locomotive/steam/decorators.rb

@@ -0,0 +1 @@
+require_relative 'decorators/page_decorator'

data/lib/locomotive/steam/decorators/page_decorator.rb

@@ -0,0 +1,50 @@
+module Locomotive
+  module Steam
+    module Decorators
+      class PageDecorator < SimpleDelegator
+
+        # Return the fullpath dasherized and with the "*" character
+        # for the slug of templatized page.
+        #
+        # @return [ hash ] The safe full paths
+        #
+
+        def safe_fullpath
+          if index_or_404?
+            slug[current_locale]
+          else
+            base  = parent.safe_fullpath
+            _slug = if templatized? && !templatized_from_parent
+              '*'
+            else
+              slug[current_locale]
+            end
+            (base == 'index' ? _slug : File.join(base, _slug)).dasherize
+          end
+        end
+
+        def parent
+          Locomotive::Steam::Decorators::PageDecorator.new(
+            Locomotive::Decorators::I18nDecorator.new(
+              __getobj__.parent, current_locale
+            )
+          )
+        end
+
+        # Return the Liquid template based on the raw_template property
+        # of the page. If the template is HAML or SLIM, then a pre-rendering to Liquid is done.
+        #
+        # @return [ String ] The liquid template or nil if not template has been provided
+        #
+        def source(locale)
+          @source ||= self.template[locale].source
+        end
+
+        def to_liquid
+          ::Locomotive::Steam::Liquid::Drops::Page.new(self)
+        end
+
+      end
+    end
+  end
+end

data/lib/locomotive/steam/entities/content_type.rb

@@ -0,0 +1,11 @@
+module Locomotive
+  module Steam
+    module Entities
+      class ContentType
+        include Locomotive::Entity
+        ## fields ##
+
+      end
+    end
+  end
+end

data/lib/locomotive/steam/entities/page.rb

@@ -0,0 +1,136 @@
+module Locomotive
+  module Steam
+    module Entities
+      class Page
+        include Locomotive::Entity
+
+        ## fields ##
+        attributes :parent, :title, :slug, :fullpath, :redirect_url, :redirect_type,
+                   :template, :handle, :listed, :searchable, :templatized, :content_type,
+                   :published, :cache_strategy, :response_type, :position, :seo_title,
+                   :meta_keywords, :meta_description, :editable_elements, :site, :children,
+                   :site_id, :parent_id
+
+        ## aliases ##
+        alias :listed?      :listed
+        alias :published?   :published
+        alias :templatized? :templatized
+        alias :searchable?  :searchable
+
+        attr_accessor :templatized_from_parent
+
+        # Tell if the page is either the index page.
+        #
+        # @return [ Boolean ] True if index page.
+        #
+        def index?
+          'index' == default_fullpath
+        end
+
+        # Tell if the page is either the index or the 404 page.
+        #
+        # @return [ Boolean ] True if index or 404 page.
+        #
+        def index_or_404?
+          %w(index 404).include?(default_fullpath)
+        end
+
+
+        # Returns unique fullpath for depth, 404, index calculation.
+        #
+        # @return [String] Fullpath based on first locale found
+        def default_fullpath
+          fullpath.values.first
+        end
+
+        alias :index_or_not_found? :index_or_404?
+
+        def with_cache?
+          self.cache_strategy != 'none'
+        end
+
+        def default_response_type?
+          self.response_type == 'text/html'
+        end
+
+        # Is it a redirect page ?
+        #
+        # @return [ Boolean ] True if the redirect_url property is set
+        #
+        def redirect?
+          false
+          #!self.redirect_url.blank?
+        end
+
+        # Depth of the page in the site tree.
+        # Both the index and 404 pages are 0-depth.
+        #
+        # @return [ Integer ] The depth
+        #
+        def depth
+          return 0 if %w(index 404).include?(default_fullpath)
+          default_fullpath.split('/').size
+        end
+
+        def unpublished?
+          !self.published?
+        end
+
+        # Modified setter in order to set correctly the slug
+        #
+        # @param [ String ] fullpath The fullpath
+        #
+        def fullpath_with_setting_slug=(fullpath)
+          fullpath.each do |key, value|
+            if value && (self.slug ||= {})[key].nil?
+              self.slug[key] = File.basename(value)
+            end
+          end
+          self.fullpath_without_setting_slug = fullpath
+        end
+
+        alias_method_chain :fullpath=, :setting_slug
+
+        # Modified setter in order to set inheritance fields from parent
+        #
+        # @param [ String ] fullpath The fullpath
+        #
+        # def parent_with_inheritance=(parent)
+        #   self.templatized_from_parent = parent.templatized?
+
+        #   # copy properties from the parent
+        #   %w(templatized content_type).each do |name|
+        #     self.send(:"#{name}=", parent.send(name.to_sym))
+        #   end
+
+        #   self.parent_without_inheritance = parent
+        # end
+        # alias_method_chain :parent=, :inheritance
+
+
+        # Find an editable element from its block and slug (the couple is unique)
+        #
+        # @param [ String ] block The name of the block
+        # @param [ String ] slug The slug of the element
+        #
+        # @return [ Object ] The editable element or nil if not found
+        #
+        def find_editable_element(block, slug)
+          (self.editable_elements || []).detect do |el|
+            el.block.to_s == block.to_s && el.slug.to_s == slug.to_s
+          end
+        end
+
+
+        # Set the source of the page without any pre-rendering. Used by the API reader.
+        #
+        # @param [ String ] content The HTML raw template
+        #
+        def raw_template=(content, locale)
+          @source ||= {}
+          @source[locale] = content
+        end
+      end
+    end
+  end
+end