sbdevcore 0.3.5 → 0.3.6

data/app/assets/stylesheets/_bar_nav.scss

@@ -9,10 +9,6 @@
   }
 }
 
-.content {
-  margin-top: 0 !important;
-}
-
 #main_container {
   @include box-shadow($shadow-radius);
   @include corners-bottom($corner-radius);

data/app/models/photo.rb

@@ -1,14 +1,9 @@
 require "iconv"
-require 'open-uri'
 class Photo < ActiveRecord::Base
   belongs_to :index
-  attr_accessor :url
   attr_accessible :name, :description, :asset, :asset_file_name, :asset_content_type, :asset_file_size, :klass, :url
 
   validates_presence_of :name, :asset
-  validates_url :url, :unless => Proc.new{self.url.blank?}
-
-  before_validation :download_remote_image, :if => :image_url_provided?
 
   include ActsAsPrioritizable
   acts_as_prioritizable("index", "assets")
@@ -65,20 +60,4 @@ class Photo < ActiveRecord::Base
     filename = asset_file_name.gsub(/\.#{extension}$/, '')
     self.asset.instance_write(:file_name, "#{transliterate(filename)}.#{transliterate(extension)}")
   end
-
-  private
-  def image_url_provided?
-    !self.url.blank?
-  end
-
-  def download_remote_image
-    self.asset = do_download_remote_image
-  end
-
-  def do_download_remote_image
-    io = open(URI.parse(url))
-    def io.original_filename; base_uri.path.split('/').last; end
-    io.is_a?(Tempfile) ? nil : io
-  rescue nil
-  end
 end

data/lib/sbdevcore/engine.rb

@@ -15,6 +15,7 @@ require 'will_paginate'
 require 'aws/s3'
 require 'inherited_resources'
 require 'friendly_id'
+require 'has_scope'
 require 'sbdevcore'
 
 module Sbdevcore

data/lib/sbdevcore/version.rb

@@ -1,4 +1,4 @@
 module Sbdevcore
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end
 

data/sbdevcore.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.add_dependency('tinymce-rails')
   s.add_dependency('prioritizable', ">= 0.0.5")
   s.add_dependency('devise')
-  s.add_dependency('paperclip')
+  s.add_dependency('paperclip', "2.3.8")
   s.add_dependency('haml-edge')
   s.add_dependency('sitemap_generator')
   s.add_dependency("hpricot")
@@ -32,4 +32,5 @@ Gem::Specification.new do |s|
   s.add_dependency('aws-s3')
   s.add_dependency('inherited_resources')
   s.add_dependency("friendly_id", "~> 4.0.0.beta8")
+  s.add_dependency("has_scope")
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sbdevcore
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-13 00:00:00.000000000Z
+date: 2011-12-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tinymce-rails
-  requirement: &2156357740 !ruby/object:Gem::Requirement
+  requirement: &2153768120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156357740
+  version_requirements: *2153768120
 - !ruby/object:Gem::Dependency
   name: prioritizable
-  requirement: &2156357240 !ruby/object:Gem::Requirement
+  requirement: &2156633780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *2156357240
+  version_requirements: *2156633780
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &2156383420 !ruby/object:Gem::Requirement
+  requirement: &2156633360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,21 +43,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156383420
+  version_requirements: *2156633360
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &2156382960 !ruby/object:Gem::Requirement
+  requirement: &2156632820 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - =
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.3.8
   type: :runtime
   prerelease: false
-  version_requirements: *2156382960
+  version_requirements: *2156632820
 - !ruby/object:Gem::Dependency
   name: haml-edge
-  requirement: &2156382540 !ruby/object:Gem::Requirement
+  requirement: &2156632400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156382540
+  version_requirements: *2156632400
 - !ruby/object:Gem::Dependency
   name: sitemap_generator
-  requirement: &2156382120 !ruby/object:Gem::Requirement
+  requirement: &2156631940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156382120
+  version_requirements: *2156631940
 - !ruby/object:Gem::Dependency
   name: hpricot
-  requirement: &2156381700 !ruby/object:Gem::Requirement
+  requirement: &2156631520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156381700
+  version_requirements: *2156631520
 - !ruby/object:Gem::Dependency
   name: simple_form
-  requirement: &2156381280 !ruby/object:Gem::Requirement
+  requirement: &2156631100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156381280
+  version_requirements: *2156631100
 - !ruby/object:Gem::Dependency
   name: client_side_validations
-  requirement: &2156380860 !ruby/object:Gem::Requirement
+  requirement: &2156630680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156380860
+  version_requirements: *2156630680
 - !ruby/object:Gem::Dependency
   name: formalize-rails
-  requirement: &2156380440 !ruby/object:Gem::Requirement
+  requirement: &2156630260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156380440
+  version_requirements: *2156630260
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &2156379940 !ruby/object:Gem::Requirement
+  requirement: &2156629760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 3.0.pre4
   type: :runtime
   prerelease: false
-  version_requirements: *2156379940
+  version_requirements: *2156629760
 - !ruby/object:Gem::Dependency
   name: aws-s3
-  requirement: &2156379520 !ruby/object:Gem::Requirement
+  requirement: &2156629340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156379520
+  version_requirements: *2156629340
 - !ruby/object:Gem::Dependency
   name: inherited_resources
-  requirement: &2156379060 !ruby/object:Gem::Requirement
+  requirement: &2156628880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156379060
+  version_requirements: *2156628880
 - !ruby/object:Gem::Dependency
   name: friendly_id
-  requirement: &2156378560 !ruby/object:Gem::Requirement
+  requirement: &2156628380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -164,7 +164,18 @@ dependencies:
         version: 4.0.0.beta8
   type: :runtime
   prerelease: false
-  version_requirements: *2156378560
+  version_requirements: *2156628380
+- !ruby/object:Gem::Dependency
+  name: has_scope
+  requirement: &2156627960 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2156627960
 description: Core
 email:
 - aosalias@gmail.com