seven_gallery 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c03b38f2e8a88e6d36f735590c7521b3e1f22a61
-  data.tar.gz: e132c83b0c5d0310c7bbc95ac6fb5e2c9c3a9e33
+  metadata.gz: 2fa23cdf120f12888761c8ba25151a6257587c87
+  data.tar.gz: 48bd1d4a6e74ee91814208d2a32c0359ff13e691
 SHA512:
-  metadata.gz: ca00f2033bd918743ac5c2c7ce70c399896cb2cd0c3616e040679e684f0a4eb5f3a6cf0451d0fa5cf2ccb38ef96eb4f9a33b0af3eab3dfb352b604cb20add4a0
-  data.tar.gz: e057d27e96774f47d42cf72e229928186a280f5984dc0c65b320e23a4c282dabd6f25183c9f10f9664552c6e7498352f904fffe5c64ccb90555e642a2a7851e8
+  metadata.gz: 8b5bd2a039a8a521955bc1dbf09c9f5673dfc35facfee149fdbbdbe9535e9e65f778cc22b91c4cdecd03a15cc6e874804d610c0a5aa1bcccd43ae30ae898856b
+  data.tar.gz: e817dfdb4cd8b6aa6b3f0fc014d4e10b2d77aa165c3850b70ecf43e0d2663b760744258df15002519f3999eae256005931adff443d1e1c50fbc946bd65488aea

data/app/controllers/seven_gallery/concerns/galleries_controller.rb

@@ -12,7 +12,7 @@ module SevenGallery::Concerns::GalleriesController
 
   # GET /galleries/1
     def show
-      @photos = SevenGallery::Photo.where(gallery_id: @gallery).paginate(page: params[:page], per_page: 5)
+      @photos = @gallery.photos.paginate(page: params[:page])
     end
 
   # GET /galleries/new

data/app/models/seven_gallery/concerns/gallery.rb

@@ -2,7 +2,7 @@ module SevenGallery::Concerns::Gallery
 	extend ActiveSupport::Concern
 
 	included do
-		has_many :photos, dependent: :destroy
-    	default_scope { order("created_at desc") }
+		has_many :photos, class_name: "SevenGallery::Photo", foreign_key: "seven_gallery_gallery_id", dependent: :destroy
+    default_scope { order("created_at desc") }
 	end
 end

data/app/models/seven_gallery/concerns/photo.rb

@@ -2,7 +2,7 @@ module SevenGallery::Concerns::Photo
 	extend ActiveSupport::Concern
 
 	included do
-    belongs_to :gallery
+    belongs_to :gallery, class_name: "SevenGallery::Gallery"
     mount_uploader :image, SevenGallery::PhotoUploader
     attr_accessor :crop_x, :crop_y, :crop_h, :crop_w
     default_scope { order("position asc, created_at desc") }

data/db/migrate/20150329123256_create_seven_gallery_photos.rb

@@ -3,7 +3,7 @@ class CreateSevenGalleryPhotos < ActiveRecord::Migration
     create_table :seven_gallery_photos do |t|
       t.string :caption
       t.string :image
-      t.references :gallery, index: true, foreign_key: true
+      t.references :seven_gallery_gallery, index: true
 
       t.timestamps null: false
     end

data/db/migrate/20150408131836_add_foreign_key_to_galleries.rb

@@ -0,0 +1,5 @@
+class AddForeignKeyToGalleries < ActiveRecord::Migration
+  def change
+    add_foreign_key :seven_gallery_photos, :seven_gallery_galleries, dependent: :delete
+  end
+end

data/lib/seven_gallery/version.rb

@@ -1,3 +1,3 @@
 module SevenGallery
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/test/dummy/config/database.yml

@@ -10,8 +10,12 @@ default: &default
   timeout: 5000
 
 development:
-  <<: *default
-  database: db/development.sqlite3
+  adapter: mysql2
+  database: seven_gallery
+  username: root
+  password: root
+#  <<: *default
+#  database: db/development.sqlite3
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".

data/test/dummy/db/schema.rb

@@ -11,27 +11,28 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150331182708) do
+ActiveRecord::Schema.define(version: 20150408131836) do
 
   create_table "seven_gallery_galleries", force: :cascade do |t|
-    t.string   "title"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.string   "title",      limit: 255
+    t.datetime "created_at",             null: false
+    t.datetime "updated_at",             null: false
   end
 
   create_table "seven_gallery_photos", force: :cascade do |t|
-    t.string   "caption"
-    t.string   "image"
-    t.integer  "gallery_id"
-    t.datetime "created_at",                  null: false
-    t.datetime "updated_at",                  null: false
-    t.boolean  "is_new",      default: true
-    t.boolean  "is_featured", default: false
-    t.text     "description"
-    t.string   "alt"
-    t.integer  "position",    default: 0
+    t.string   "caption",                  limit: 255
+    t.string   "image",                    limit: 255
+    t.integer  "seven_gallery_gallery_id", limit: 4
+    t.datetime "created_at",                                             null: false
+    t.datetime "updated_at",                                             null: false
+    t.boolean  "is_new",                   limit: 1,     default: true
+    t.boolean  "is_featured",              limit: 1,     default: false
+    t.text     "description",              limit: 65535
+    t.string   "alt",                      limit: 255
+    t.integer  "position",                 limit: 4,     default: 0
   end
 
-  add_index "seven_gallery_photos", ["gallery_id"], name: "index_seven_gallery_photos_on_gallery_id"
+  add_index "seven_gallery_photos", ["seven_gallery_gallery_id"], name: "index_seven_gallery_photos_on_seven_gallery_gallery_id", using: :btree
 
+  add_foreign_key "seven_gallery_photos", "seven_gallery_galleries"
 end