picturama 1.0.0beta → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f94e6dbd92b5068221f701289dfa3d90ad57afcb
-  data.tar.gz: d42d463a3063185db61a277aa9f5d231bbba9e5e
+  metadata.gz: 5ce8ef1ddfecc75ce3d21e1a43b5d1374f05f2e4
+  data.tar.gz: 749b20d61a868023c2ad7db7fcc682b621d76c24
 SHA512:
-  metadata.gz: f7544e4744d0b6e01a5bf0caf96bf81c60ab08abba540a30536131d4a5e45f07a7e04097dc8e0fc7071fd3cb79ed6dc723a4282184796d25d6635b81a916d602
-  data.tar.gz: ab38bc39afd97314648fa536a4972415d0f0fb917431bb2ffd932bab1198a4988b04e69de82a69882fedeeb834cfc87701d4c93e2ec206ef88b23fac8a016a54
+  metadata.gz: 9e3319d7ba9b076b68fe42db525d6794711f78c530a375c979c659815c85d2f8673978d7d5ab3f7bbc0481f1482eef8d164e98eb51c51a88b938d1ce8136d673
+  data.tar.gz: d63a9857e182e1b5d453f97f5c072a1622ea5c0a1f80b1dfab2144474ae17654a9be9555cad1fc6a05e04b262cf9d93c43c650fb2234a4fb7b5241e8f4ec4dca

data/.gitignore

@@ -1,3 +1,4 @@
 .rvmrc
 config/config.yml
 coverage/
+config/picturama.yml

data/Gemfile

@@ -2,6 +2,7 @@ source 'https://rubygems.org'
 
 gem 'rake'
 gem 'coveralls', require: false
+gem 'debugger'
 gem 'pry-debugger'
 
 gemspec

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    picturama (1.0.0beta)
-      mini_magick (~> 3.6.0)
-      stringex (~> 2.0.2)
+    picturama (1.0.1)
+      mini_magick (~> 3.6)
+      stringex (~> 2.0)
 
 GEM
   remote: https://rubygems.org/
@@ -23,10 +23,10 @@ GEM
       debugger-ruby_core_source (~> 1.3.5)
     debugger-linecache (1.2.0)
     debugger-ruby_core_source (1.3.8)
-    diff-lcs (1.2.4)
+    diff-lcs (1.2.5)
     method_source (0.8.2)
     mime-types (1.23)
-    mini_magick (3.6.0)
+    mini_magick (3.8.1)
       subexec (~> 0.2.1)
     multi_json (1.7.6)
     pry (0.10.1)
@@ -39,20 +39,24 @@ GEM
     rake (10.0.3)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.1)
+    rspec (3.0.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+    rspec-core (3.0.4)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.4)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.4)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.4)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
     slop (3.6.0)
-    stringex (2.0.2)
+    stringex (2.5.2)
     subexec (0.2.3)
     thor (0.18.1)
 
@@ -61,7 +65,8 @@ PLATFORMS
 
 DEPENDENCIES
   coveralls
+  debugger
   picturama!
   pry-debugger
   rake
-  rspec
+  rspec (= 3.0.0)

data/config/picturama.sample.yml

@@ -0,0 +1,7 @@
+picturama:
+  album_source: "%{album_path}"
+  allowed_formats: "%{album_format}" # array
+  thumbnail_prefix: "%{album_thumbnail_prefix}"
+  thumnail_default_size: "%{album_thumbnail_size}" #eg 200x200
+  resized_prefix: "%{album_resized_prefix}"
+  resized_default_size: "%{album_resized_size}" #eg 800x800

data/lib/picturama.rb

@@ -11,7 +11,7 @@ module Picturama
   Dir["lib/picturama/*.rb"].each { |file| require "#{Dir.pwd}/#{file}" }
 
   def self.config
-    YAML.load_file('config/config.yml')['picturama']
+    YAML.load_file('config/picturama.yml')['picturama']
   end
 
   def self.albums(album_source)

data/lib/picturama/album.rb

@@ -2,12 +2,11 @@ require 'picturama'
 
 module Picturama
   class Album
-    
+
     def initialize(args)
-      @folder = args[:folder]
-      @thumbnails = "#{args[:folder]}/thumbnails"
-      @resized = "#{args[:folder]}/resized"
-      @info = "#{args[:folder]}/.info.yml"
+      @folder     = args[:folder]
+      @thumbnails = "#{@folder}/thumbnails"
+      @resized    = "#{@folder}/resized"
     end
 
     def pictures(order = :basename)
@@ -61,7 +60,7 @@ module Picturama
     end
 
     def info
-      YAML.load_file(@info) if File.exists?(@info)
+      YAML.load_file("#{@folder}/.info.yml") if File.exists?("#{@folder}/.info.yml")
     end
 
     def valid?

data/lib/picturama/version.rb

@@ -1,3 +1,3 @@
 module Picturama
-  VERSION = '1.0.0beta'
+  VERSION = '1.0.1'
 end

data/spec/album_spec.rb

@@ -12,8 +12,8 @@ describe "For a given folder" do
   end
 
   it "check thumnails for images" do
-    expect(album.pictures.first.has_thumbnail?).to be_false
-    expect(album.pictures.first.has_resized?).to be_false
+    expect(album.pictures.first.has_thumbnail?).to eq false
+    expect(album.pictures.first.has_resized?).to eq false
   end
 
   it "check info for files" do

data/spec/picture_spec.rb

@@ -11,14 +11,14 @@ describe "For a given picture in a given album" do
   before { album.init_thumbnails }
 
   it "generate thumbnail" do
-    expect(picture.has_thumbnail?).to be_false
+    expect(picture.has_thumbnail?).to eq false
     thumb = MiniMagick::Image.open(picture.path)
     thumb.resize "100x100"
     thumb.format "jpg"
     thumb.write picture.thumbnail
-    expect(picture.has_thumbnail?).to be_true
+    expect(picture.has_thumbnail?).to eq true
     picture.remove_assoc
-    expect(picture.has_thumbnail?).to be_false
+    expect(picture.has_thumbnail?).to eq false
   end
 
   it "checks the image basename" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: picturama
 version: !ruby/object:Gem::Version
-  version: 1.0.0beta
+  version: 1.0.1
 platform: ruby
 authors:
 - David Silveira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-12 00:00:00.000000000 Z
+date: 2015-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_magick
@@ -66,7 +66,7 @@ files:
 - Gemfile.lock
 - LICENCE
 - README.md
-- config/config.sample.yml
+- config/picturama.sample.yml
 - i18n/en.yml
 - i18n/es.yml
 - lib/ext/string.rb
@@ -103,9 +103,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2

data/config/config.sample.yml

@@ -1,7 +0,0 @@
-picturama:
-  album_source: '[your_path_here]'
-  allowed_formats: ['jpg','png','jpeg','JPG']
-  thumbnail_prefix: thumb_
-  thumnail_default_size: "200x200"
-  resized_prefix: resized_
-  resized_default_size: "800x800"