gollum_rails 1.6.0 → 1.6.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTc1MGI5YjRhZjVlNTNlNmYzYzM4MThkMTY3NGUyMThiMzdiY2FjNw==
+    OTRkNTIyMjA0NGU1ODc4ZTZiNDk1NzlkYWUzYzc4NDFjNzRiY2Y0Zg==
   data.tar.gz: !binary |-
-    ODZkZDc5MTQwNDY5ODk1MjI2ZDk5MDFhYjQ0MjY1ZWEzZDRhZjMyNQ==
+    MjYzZTczY2IwZTA2YWQ5YmU3ZGEyNzRjZDA4ZWVlMDVkZjUyMTlhMg==
 SHA512:
   metadata.gz: !binary |-
-    ZDMxNDllZDRkMWQ5ZmIzOWNjYmI0MDNkMTJhY2MxODQ1ZDg3NzY2MDFjYTg1
-    MDViNDE3MTkyMzMzMTQyYmExNDRmMzVlMGY5MmEzN2YzNWZmNGI2MTVjM2Qx
-    NTM2ZTc5NzJlNGRiNmQ2OGRiYzdmZTQ0Y2U1NzVhMzRiOWJiNzE=
+    YmMzZGIwYjE1OWNjODk2MWM0NmI4ZTI0MjMxNGI4MTlhZjkyODM1ZjExMDMw
+    YjE3YmExY2RhN2NkYmNiYTRhYjk5MjUyMDFmNWUwZmQ2MWE5ODY0NWNlNjI0
+    YzhlM2UzMDg1YTExYTg2M2YyZGZkYjZhYjE0YmMzODI1ZmE3NDU=
   data.tar.gz: !binary |-
-    MmY0ZmJkZjk3NWM5MjNlZDNlYTM0YTBkYTMzMjk5MmUzMzJiMTM1MjJjMzBj
-    ODU2OTYzOTdiMmRkZDllZWE4MzYzZjA4MWNjNTBhNjUyNGNmNWMyOWI3Njc1
-    Nzc0ODk5ZDE2MTQyNjI2ODhhZDk0YzIyNzFjMDZmOTViMmJmOWI=
+    OTljNjQ4NDFhZDc2MmU3MjVlZDJjNjcwZmZmZThkZDJjYTBhOTc3NTdjZTcw
+    MjQ2MmMwMWJlMmZhZThkNGE5ODJiNjZjMWE2NDMwMmQ0ODEwM2Y1YjI4YjVk
+    NjI3NzY2YzA5MGE5MDJiMWY2OTY5NTBhOGIwMGQ2NTE5OGY2MTc=

data/Gemfile

@@ -1,6 +1,7 @@
 source 'https://rubygems.org'
 
 gem 'coveralls', require: false
+gem 'wwtd'
 
 
 gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gollum_rails (1.6.0)
+    gollum_rails (1.6.3)
       activemodel (>= 3.2.11)
       activesupport (>= 3.2.11)
       gollum-lib (~> 3.0.0)
@@ -170,6 +170,7 @@ GEM
       polyglot (>= 0.3.1)
     tzinfo (1.2.1)
       thread_safe (~> 0.1)
+    wwtd (0.5.5)
 
 PLATFORMS
   ruby
@@ -185,3 +186,4 @@ DEPENDENCIES
   rb-fsevent (>= 0.9.3)
   redcarpet (>= 3.1.1)
   rspec (~> 3.0)
+  wwtd

data/Rakefile

@@ -2,6 +2,10 @@ require 'rubygems'
 require 'rake'
 require 'date'
 require 'rspec/core/rake_task'
+require 'wwtd/tasks'
+
+task :local => "wwtd:local"
+task default: "wwtd:local"
 
 
 #############################################################################
@@ -66,7 +70,7 @@ end
 #
 #############################################################################
 
-task :default => :spec_run
+#task :default => :spec_run
 
 desc "Run RSpec"
 RSpec::Core::RakeTask.new do |t|

data/gemfiles/rails3.gemfile

@@ -0,0 +1,4 @@
+source "https://rubygems.org"
+gemspec path: "../"
+gem "rails", "~> 3.2.18"
+gem "coveralls"

data/gemfiles/rails3.gemfile.lock

@@ -0,0 +1,235 @@
+PATH
+  remote: ../
+  specs:
+    gollum_rails (1.6.2)
+      activemodel (>= 3.2.11)
+      activesupport (>= 3.2.11)
+      gollum-lib (~> 3.0.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (3.2.19)
+      actionpack (= 3.2.19)
+      mail (~> 2.5.4)
+    actionpack (3.2.19)
+      activemodel (= 3.2.19)
+      activesupport (= 3.2.19)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.5)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.19)
+      activesupport (= 3.2.19)
+      builder (~> 3.0.0)
+    activerecord (3.2.19)
+      activemodel (= 3.2.19)
+      activesupport (= 3.2.19)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.19)
+      activemodel (= 3.2.19)
+      activesupport (= 3.2.19)
+    activesupport (3.2.19)
+      i18n (~> 0.6, >= 0.6.4)
+      multi_json (~> 1.0)
+    arel (3.0.3)
+    builder (3.0.4)
+    celluloid (0.15.2)
+      timers (~> 1.1.0)
+    charlock_holmes (0.7.3)
+    coderay (1.1.0)
+    coveralls (0.7.0)
+      multi_json (~> 1.3)
+      rest-client
+      simplecov (>= 0.7)
+      term-ansicolor
+      thor
+    diff-lcs (1.2.5)
+    docile (1.1.5)
+    erubis (2.7.0)
+    factory_girl (4.4.0)
+      activesupport (>= 3.0.0)
+    ffi (1.9.3)
+    formatador (0.2.5)
+    github-markup (1.1.2)
+      posix-spawn (~> 0.3.8)
+    gitlab-grit (2.6.10)
+      charlock_holmes (~> 0.6)
+      diff-lcs (~> 1.1)
+      mime-types (~> 1.15)
+      posix-spawn (~> 0.3)
+    gollum-lib (3.0.0)
+      github-markup (~> 1.1.0)
+      gitlab-grit (~> 2.6.5)
+      nokogiri (~> 1.6.1)
+      rouge (~> 1.3.3)
+      sanitize (~> 2.1.0)
+      stringex (~> 2.5.1)
+    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.10)
+      guard (~> 2.1)
+      rspec (>= 2.14, < 4.0)
+    hashr (0.0.22)
+    hike (1.2.3)
+    i18n (0.6.11)
+    journey (1.0.4)
+    json (1.8.1)
+    listen (2.7.9)
+      celluloid (>= 0.15.2)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+    lumberjack (1.0.9)
+    mail (2.5.4)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    method_source (0.8.2)
+    mime-types (1.25.1)
+    mini_portile (0.6.0)
+    multi_json (1.10.1)
+    netrc (0.7.7)
+    nokogiri (1.6.3.1)
+      mini_portile (= 0.6.0)
+    polyglot (0.3.5)
+    posix-spawn (0.3.9)
+    pry (0.10.0)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    rack (1.4.5)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.4)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (3.2.19)
+      actionmailer (= 3.2.19)
+      actionpack (= 3.2.19)
+      activerecord (= 3.2.19)
+      activeresource (= 3.2.19)
+      activesupport (= 3.2.19)
+      bundler (~> 1.0)
+      railties (= 3.2.19)
+    railties (3.2.19)
+      actionpack (= 3.2.19)
+      activesupport (= 3.2.19)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
+    rake (10.3.2)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.5)
+      ffi (>= 0.5.0)
+    rdoc (3.12.2)
+      json (~> 1.4)
+    redcarpet (3.1.2)
+    rest-client (1.7.2)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
+    rouge (1.3.4)
+    rspec (3.0.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+    rspec-core (3.0.3)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.3)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.3)
+    sanitize (2.1.0)
+      nokogiri (>= 1.4.4)
+    simplecov (0.9.0)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
+    slop (3.6.0)
+    sprockets (2.2.2)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    stringex (2.5.2)
+    term-ansicolor (1.3.0)
+      tins (~> 1.0)
+    thor (0.19.1)
+    tilt (1.4.1)
+    timers (1.1.0)
+    tins (1.3.1)
+    treetop (1.4.15)
+      polyglot
+      polyglot
+      polyglot
+      polyglot
+      polyglot
+      polyglot
+      polyglot
+      polyglot
+      polyglot
+      polyglot
+      polyglot
+      polyglot
+      polyglot
+      polyglot
+      polyglot
+      polyglot
+      polyglot
+      polyglot (>= 0.3.1)
+      polyglot (>= 0.3.1)
+      polyglot (>= 0.3.1)
+      polyglot (>= 0.3.1)
+      polyglot (>= 0.3.1)
+      polyglot (>= 0.3.1)
+      polyglot (>= 0.3.1)
+      polyglot (>= 0.3.1)
+      polyglot (>= 0.3.1)
+      polyglot (>= 0.3.1)
+      polyglot (>= 0.3.1)
+      polyglot (>= 0.3.1)
+      polyglot (>= 0.3.1)
+      polyglot (>= 0.3.1)
+      polyglot (>= 0.3.1)
+      polyglot (>= 0.3.1)
+      polyglot (>= 0.3.1)
+      polyglot (>= 0.3.1)
+      polyglot (>= 0.3.1)
+      polyglot (>= 0.3.1)
+      polyglot (>= 0.3.1)
+      polyglot (>= 0.3.1)
+      polyglot (>= 0.3.1)
+      polyglot (>= 0.3.1)
+      polyglot (>= 0.3.1)
+      polyglot (>= 0.3.1)
+      polyglot (>= 0.3.1)
+      polyglot (>= 0.3.1)
+      polyglot (>= 0.3.1)
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.41)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  coveralls
+  factory_girl (~> 4.4)
+  gollum_rails!
+  guard (~> 2.6.0)
+  guard-rspec (~> 4.2.8)
+  hashr (~> 0.0.22)
+  rails (~> 3.2.18)
+  rb-fsevent (>= 0.9.3)
+  redcarpet (>= 3.1.1)
+  rspec (~> 3.0)

data/gemfiles/rails3213.gemfile

@@ -0,0 +1,4 @@
+source "https://rubygems.org"
+gemspec path: "../"
+gem "rails", "~> 3.2.13"
+gem "coveralls"

data/gemfiles/rails4.gemfile

@@ -0,0 +1,4 @@
+source "https://rubygems.org"
+gemspec path: "../"
+gem "rails", "~> 4.1.4"
+gem "coveralls"

data/gollum_rails.gemspec

@@ -4,7 +4,7 @@ Gem::Specification.new do |s|
   s.name = 'gollum_rails'
   s.rubyforge_project = s.name
 
-  s.version = '1.6.0'
+  s.version = '1.6.3'
 
   s.summary = 'Combines Gollum and Rails'
   s.description= 'include Gollum into Rails with ease'
@@ -38,6 +38,10 @@ Gem::Specification.new do |s|
     LICENSE
     README.md
     Rakefile
+    gemfiles/rails3.gemfile
+    gemfiles/rails3.gemfile.lock
+    gemfiles/rails3213.gemfile
+    gemfiles/rails4.gemfile
     gollum_rails.gemspec
     lib/generators/gollum_rails/install/install_generator.rb
     lib/generators/gollum_rails/install/templates/gollum_initializer.rb

data/lib/gollum_rails.rb

@@ -45,7 +45,7 @@ module GollumRails
   autoload :Meta
 
   # GollumRails version
-  VERSION = '1.6.0'
+  VERSION = '1.6.3'
 
 end
 

data/lib/gollum_rails/upload.rb

@@ -1,8 +1,10 @@
 module GollumRails
   class Upload
     if ActiveModel::VERSION::MAJOR == 4
+      API_VERSION=4
       include ActiveModel::Model
     else
+      API_VERSION=3
       extend ActiveModel::Naming
       extend ActiveModel::Callbacks
       include ActiveModel::Conversion
@@ -41,10 +43,15 @@ module GollumRails
       # Allowed formats in future
       format = ext.split('.').last || "txt"
       filename = ::File.basename(fullname, ext)
-      contents = ::File.read(tempfile)
+      if tempfile.respond_to?(:tempfile)
+        contents = ::File.read(tempfile.tempfile)
+      else
+        contents = ::File.read(tempfile)
+      end
       #reponame = filename + '.' + format
       head = self.class.wiki.repo.head
 
+      @commit ||= {}
       options = self.commit.merge(parent: head.commit)
       committer = Gollum::Committer.new(self.class.wiki, options)
       committer.add_to_index(@dir, filename, format, contents)

data/spec/gollum_rails/upload_spec.rb

@@ -54,7 +54,14 @@ describe GollumRails::Upload do
     end
   end
 
-  describe "::create" do
+  describe ".create" do
+    describe "with empty committer" do
+      let(:ins){create(:upload, commit: nil)}
+      it "should not fail to create" do
+        expect{ins}.not_to raise_error
+
+      end
+    end
 
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gollum_rails
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.3
 platform: ruby
 authors:
 - Florian Kasper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-19 00:00:00.000000000 Z
+date: 2014-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -177,6 +177,10 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- gemfiles/rails3.gemfile
+- gemfiles/rails3.gemfile.lock
+- gemfiles/rails3213.gemfile
+- gemfiles/rails4.gemfile
 - gollum_rails.gemspec
 - lib/generators/gollum_rails/install/install_generator.rb
 - lib/generators/gollum_rails/install/templates/gollum_initializer.rb
@@ -240,7 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: gollum_rails
-rubygems_version: 2.2.2
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
 summary: Combines Gollum and Rails