lines-engine 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 100fdfe0b263d92149bee9c26acc26d08a96c41a
-  data.tar.gz: d28174c5c5d2d5bc0fe4e2f9cddf999e401f8532
+  metadata.gz: c75b66e2862656500bbf544915c6c8b554b3cb8d
+  data.tar.gz: 3396baaf3becd71a03e255ea63af3a8bea533aa1
 SHA512:
-  metadata.gz: 3f7a9e5b4ca8f3b6164cc3569798ef58b10eb7adae89c78fd76b6d5cb45eee51e4611a967539927e07abe7d119daa4e48a8372c0dde9afc076d297c47d3cf076
-  data.tar.gz: 3086da633d6c042cd89a76857c4212820b514003cbf3e3e01ae43f0ffacf9fadc15ffbc01e5578bbb110929526a76a55932533f5580bb813db8643d4ab43664a
+  metadata.gz: f427d273b55339e8639c344b77c23d3b4d8187e92f16474de74073b3bf921ec18feb956274d795d1bdaa874107aa599bc0a96faece4274ce02da117a879aee8d
+  data.tar.gz: 1d1ec819aeb65064243a2aa79356bcb8052191aa301feddc2c28059ba454abca12d5ad60e229548ef299e17c730e09974194eb8eda6ec32276da95d564674f32

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    lines-engine (0.1.16)
+    lines-engine (0.1.17)
       acts-as-taggable-on (~> 3.2.6, >= 3.2.6)
       bcrypt (~> 3.1.0, >= 3.1.0)
       carrierwave (~> 0.10.0, >= 0.10.0)
@@ -15,7 +15,6 @@ PATH
       orm_adapter (~> 0.1, >= 0.5)
       pygments.rb (~> 0.6.0, >= 0.6.0)
       rack-ssl-enforcer (~> 0.2.7, >= 0.2.7)
-      rails (>= 3, < 5)
       rails3-jquery-autocomplete (~> 1.0.11, >= 1.0.11)
       railties (>= 3.2.6, < 5)
       redcarpet (~> 3.1.2, >= 3.1.2)
@@ -31,27 +30,27 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.1.0)
-      actionpack (= 4.1.0)
-      actionview (= 4.1.0)
-      mail (~> 2.5.4)
-    actionpack (4.1.0)
-      actionview (= 4.1.0)
-      activesupport (= 4.1.0)
+    actionmailer (4.1.6)
+      actionpack (= 4.1.6)
+      actionview (= 4.1.6)
+      mail (~> 2.5, >= 2.5.4)
+    actionpack (4.1.6)
+      actionview (= 4.1.6)
+      activesupport (= 4.1.6)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    actionview (4.1.0)
-      activesupport (= 4.1.0)
+    actionview (4.1.6)
+      activesupport (= 4.1.6)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.0)
-      activesupport (= 4.1.0)
+    activemodel (4.1.6)
+      activesupport (= 4.1.6)
       builder (~> 3.1)
-    activerecord (4.1.0)
-      activemodel (= 4.1.0)
-      activesupport (= 4.1.0)
+    activerecord (4.1.6)
+      activemodel (= 4.1.6)
+      activesupport (= 4.1.6)
       arel (~> 5.0.0)
-    activesupport (4.1.0)
+    activesupport (4.1.6)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -67,7 +66,7 @@ GEM
       i18n
       rake (>= 10.0.0)
       sshkit (~> 1.3)
-    capybara (2.2.1)
+    capybara (2.4.3)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
@@ -78,11 +77,8 @@ GEM
       activesupport (>= 3.2.0)
       json (>= 1.7)
       mime-types (>= 1.16)
-    celluloid (0.15.2)
-      timers (~> 1.1.0)
-    celluloid-io (0.15.0)
-      celluloid (>= 0.15.0)
-      nio4r (>= 0.5.0)
+    celluloid (0.16.0)
+      timers (~> 4.0.0)
     coderay (1.1.0)
     coffee-rails (4.0.1)
       coffee-script (>= 2.2.0)
@@ -91,6 +87,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.8.0)
+    colorize (0.7.3)
     crass (0.2.1)
     diff-lcs (1.2.5)
     erubis (2.7.0)
@@ -100,23 +97,24 @@ GEM
     factory_girl_rails (4.4.1)
       factory_girl (~> 4.4.0)
       railties (>= 3.0.0)
-    faker (1.3.0)
+    faker (1.4.3)
       i18n (~> 0.5)
-    ffi (1.9.3)
-    formatador (0.2.4)
+    ffi (1.9.5)
+    formatador (0.2.5)
     friendly_id (5.0.4)
       activerecord (>= 4.0.0)
-    guard (2.6.0)
+    guard (2.6.1)
       formatador (>= 0.2.4)
       listen (~> 2.7)
       lumberjack (~> 1.0)
       pry (>= 0.9.12)
       thor (>= 0.18.1)
-    guard-rspec (4.2.8)
+    guard-rspec (4.3.1)
       guard (~> 2.1)
       rspec (>= 2.14, < 4.0)
     hike (1.2.3)
-    i18n (0.6.9)
+    hitimes (1.2.2)
+    i18n (0.6.11)
     jquery-fileupload-rails (0.4.1)
       actionpack (>= 3.1)
       railties (>= 3.1)
@@ -131,37 +129,33 @@ GEM
       activesupport (>= 3.0.0)
     launchy (2.4.2)
       addressable (~> 2.3)
-    listen (2.7.4)
+    listen (2.7.11)
       celluloid (>= 0.15.2)
-      celluloid-io (>= 0.15.0)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-    lumberjack (1.0.5)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
+    lumberjack (1.0.9)
+    mail (2.6.1)
+      mime-types (>= 1.16, < 3)
     meta-tags (2.0.0)
       actionpack (>= 3.0.0)
     method_source (0.8.2)
-    mime-types (1.25.1)
+    mime-types (2.3)
     mini_portile (0.6.0)
-    minitest (5.3.3)
+    minitest (5.4.2)
     multi_json (1.10.1)
     mysql2 (0.3.16)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (2.9.0)
-    nio4r (1.0.0)
-    nokogiri (1.6.2.1)
+    net-ssh (2.9.1)
+    nokogiri (1.6.3.1)
       mini_portile (= 0.6.0)
     nokogumbo (1.1.12)
       nokogiri
     orm_adapter (0.5.0)
-    polyglot (0.3.5)
     posix-spawn (0.3.9)
-    pry (0.9.12.6)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
       slop (~> 3.4)
     pygments.rb (0.6.0)
       posix-spawn (~> 0.3.6)
@@ -170,27 +164,27 @@ GEM
     rack-ssl-enforcer (0.2.8)
     rack-test (0.6.2)
       rack (>= 1.0)
-    railroady (1.1.1)
-    rails (4.1.0)
-      actionmailer (= 4.1.0)
-      actionpack (= 4.1.0)
-      actionview (= 4.1.0)
-      activemodel (= 4.1.0)
-      activerecord (= 4.1.0)
-      activesupport (= 4.1.0)
+    railroady (1.1.2)
+    rails (4.1.6)
+      actionmailer (= 4.1.6)
+      actionpack (= 4.1.6)
+      actionview (= 4.1.6)
+      activemodel (= 4.1.6)
+      activerecord (= 4.1.6)
+      activesupport (= 4.1.6)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.0)
+      railties (= 4.1.6)
       sprockets-rails (~> 2.0)
     rails3-jquery-autocomplete (1.0.14)
       rails (>= 3.0)
-    railties (4.1.0)
-      actionpack (= 4.1.0)
-      activesupport (= 4.1.0)
+    railties (4.1.6)
+      actionpack (= 4.1.6)
+      activesupport (= 4.1.6)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.3.1)
+    rake (10.3.2)
     rb-fsevent (0.9.4)
-    rb-inotify (0.9.4)
+    rb-inotify (0.9.5)
       ffi (>= 0.5.0)
     redcarpet (3.1.2)
     rmagick (2.13.3)
@@ -225,7 +219,7 @@ GEM
       activemodel (~> 4.0)
     sitemap_generator (5.0.5)
       builder
-    slop (3.5.0)
+    slop (3.6.0)
     sprockets (2.11.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -235,21 +229,16 @@ GEM
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (~> 2.8)
-    sshkit (1.4.0)
+    sshkit (1.5.1)
+      colorize
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
-      term-ansicolor
-    term-ansicolor (1.3.0)
-      tins (~> 1.0)
     thor (0.19.1)
-    thread_safe (0.3.3)
+    thread_safe (0.3.4)
     tilt (1.4.1)
-    timers (1.1.0)
-    tins (1.1.0)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (1.1.0)
+    timers (4.0.1)
+      hitimes
+    tzinfo (1.2.2)
       thread_safe (~> 0.1)
     uglifier (2.5.3)
       execjs (>= 0.3.0)

data/app/controllers/lines/application_controller.rb

@@ -5,7 +5,7 @@ module Lines
 
       # sets the current_lines_user if one exists in session
       def current_lines_user
-        @current_lines_user ||= User.find(session[:user_id]) if session[:user_id]
+        @current_lines_user ||= Lines::User.find(session[:user_id]) if session[:user_id]
       end
       helper_method :current_lines_user
 

data/lib/lines.rb

@@ -1,6 +1,8 @@
-require "lines/engine"
-
 module Lines
+  if defined?(Rails)
+    require "lines/engine"
+  end
+
   # host application root path
   # We set this when the engine is initialized
   mattr_accessor :app_root

data/lib/lines/engine.rb

@@ -2,6 +2,8 @@ module Lines
   class Engine < ::Rails::Engine
     isolate_namespace Lines
 
+    config.autoload_paths += Dir["#{config.root}/lib/**/"]
+
     require 'kaminari'
     require 'jquery-rails'
     require 'jquery-ui-rails'

data/lib/lines/version.rb

@@ -1,3 +1,3 @@
 module Lines
-  VERSION = "0.1.16"
+  VERSION = "0.1.17"
 end

data/lines.gemspec

@@ -40,7 +40,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'rails3-jquery-autocomplete', '~> 1.0.11', '>= 1.0.11'
   s.add_dependency 'meta-tags', '~> 2.0.0', '>= 2.0.0'
   s.add_dependency 'rack-ssl-enforcer', '~> 0.2.7', '>= 0.2.7'
-  s.add_runtime_dependency 'rails', ['>= 3', '< 5']
+  #s.add_runtime_dependency 'rails', ['>= 3', '< 5']
 
   s.add_development_dependency 'mysql2', '~> 2.9', '>= 2.9'
   s.add_development_dependency 'rspec-rails', '~> 2.14.2', '< 3'
@@ -48,7 +48,10 @@ Gem::Specification.new do |s|
 
   s.files         = `git ls-files`.split("\n").select{ |file_name| !(file_name =~ /^spec/) }
   s.test_files    = `git ls-files`.split("\n").select{ |file_name| (file_name =~ /^spec/) }
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  #s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.executables   = s.executables   = s.files.grep(%r{^bin/}) do |f|
+    f == 'bin/rails' ? nil : File.basename(f)
+  end.compact
   s.require_paths = ["lib"]
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lines-engine
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
 platform: ruby
 authors:
 - Opoloo GbR
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-30 00:00:00.000000000 Z
+date: 2014-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: orm_adapter
@@ -496,26 +496,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.7
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -582,8 +562,7 @@ description: LINES lets you manage your posts in a clear, consistent frontend. T
   images, and links shine.
 email:
 - info@opoloo.de
-executables:
-- rails
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
@@ -832,7 +811,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: LINES is the open source blog platform you have been waiting for